diff --git a/.gitignore b/.gitignore index c12f2544..6be86263 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,6 @@ rs.cred *.dat tests/run_inputs.py cyclus.sqlite -cycamore_version.h +recyle_version.h *.sqlite -src/version.cc.in \ No newline at end of file +src/version.cc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index e0a8731f..3f293cfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,6 +297,7 @@ IF(NOT CYCLUS_DOC_ONLY) TARGET_LINK_LIBRARIES(recycle_unit_tests dl ${LIBS} + recycle ${CYCLUS_TEST_LIBRARIES} ) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 44402b6f..150bcd1a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -67,7 +67,7 @@ You can run the tests yourself using: .. code-block:: bash - $ cycamore_unit_tests + $ recyle_unit_tests Cautions ======== diff --git a/DEPENDENCIES.rst b/DEPENDENCIES.rst index a66baaa1..229fab5e 100644 --- a/DEPENDENCIES.rst +++ b/DEPENDENCIES.rst @@ -127,7 +127,7 @@ installation procedure also assumes that you have root access to you computer. .. _`Cyclus Homepage`: http://fuelcycle.org/ .. _`Cyclus User Guide`: http://fuelcycle.org/user/index.html .. _`Cyclus repo`: https://github.com/cyclus/cyclus -.. _`Cycamore Repo`: https://github.com/cyclus/cycamore +.. _`Cycamore Repo`: https://github.com/cyclus/recyle .. _Anaconda: https://www.continuum.io/downloads .. _miniconda: http://conda.pydata.org/miniconda.html .. _`dependency installation documentation`: https://github.com/cyclus/cyclus/blob/develop/DEPENDENCIES.rst diff --git a/README.rst b/README.rst index a94e89c3..d1f03091 100644 --- a/README.rst +++ b/README.rst @@ -63,10 +63,10 @@ Quick Cycamore Installation Assuming you have the dependencies installed correctly, installing Cyclus using github is fairly straightforward: -- Clone the Cyclus Repo: ``git clone https://github.com/cyclus/cycamore.git``, +- Clone the Cyclus Repo: ``git clone https://github.com/cyclus/recyle.git``, - to install Cyclus locally (in ``~/.local/``) just run: ``python install.py`` - from cycamore folder, + from recyle folder, - finally, add the following Cyclus installation path (``~/.local/cyclus``) to the **bottom** on your ``$PATH``. @@ -84,7 +84,7 @@ our tests). You can run the tests yourself via: .. code-block:: bash - $ cycamore_unit_tests + $ recyle_unit_tests ****************************** Contributing @@ -99,7 +99,7 @@ to contribute into Cyclus, please follow this procedure: #. Implement your modification of the Cycamore source code, -#. Submit a Pull request into ``cycamore/master`` branch, +#. Submit a Pull request into ``recyle/master`` branch, #. Wait for reviews/merge (the Puller cannot be the Merger). @@ -109,7 +109,7 @@ You may also want to read our `Contribution Guidelines `_. .. _`Cyclus Homepage`: http://fuelcycle.org/ .. _`Cyclus User Guide`: http://fuelcycle.org/user/index.html .. _`Cyclus repo`: https://github.com/cyclus/cyclus -.. _`Cycamore Repo`: https://github.com/cyclus/cycamore +.. _`Cycamore Repo`: https://github.com/cyclus/recyle .. _`INSTALL`: INSTALL.rst .. _`CONTRIBUTING`: CONTRIBUTING.rst diff --git a/circle.yml b/circle.yml index c50d1ee0..c7c697fd 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ jobs: build: docker: - image: cyclus/cyclus:latest - working_directory: ~/cycamore + working_directory: ~/recyle steps: # Ensure your image has git (required by git to clone via SSH) so that CircleCI can clone your repo - run: apt-get -qq update; apt-get -y install git openssh-client @@ -40,7 +40,7 @@ jobs: - v1-repo-{{ checksum ".circle-sha" }} - run: name: Unit Test - command: /root/.local/bin/cycamore_unit_tests; exit $? + command: /root/.local/bin/recyle_unit_tests; exit $? nosetest: docker: - image: cyclus/cyclus:latest @@ -57,14 +57,14 @@ jobs: command: pip install nose - run: name: Nosetests - command: nosetests -w ~/cycamore/tests; exit $? + command: nosetests -w ~/recyle/tests; exit $? # Update docker container deploy: # Cycamore -> Cycamore:latest docker: - image: circleci/ruby:2.4-node - working_directory: ~/cycamore + working_directory: ~/recyle steps: - checkout - run: @@ -77,15 +77,15 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_PASS - run: name: Build Docker container - command: docker build --rm=false -t cyclus/cycamore:latest . + command: docker build --rm=false -t cyclus/recyle:latest . - run: name: Push on DockerHub - command: docker push cyclus/cycamore:latest # push to docker depot + command: docker push cyclus/recyle:latest # push to docker depot deploy_stable: # Cycamore:stable docker: - image: circleci/ruby:2.4-node - working_directory: ~/cycamore + working_directory: ~/recyle steps: - checkout - run: @@ -98,17 +98,17 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_PASS - run: name: Build Docker container - command: docker build -t cyclus/cycamore:stable . + command: docker build -t cyclus/recyle:stable . - run: name: Push on DockerHub - command: docker push cyclus/cycamore:stable # push to docker depot + command: docker push cyclus/recyle:stable # push to docker depot # Debian package generation (on master update) deb_generation: docker: - image: circleci/ruby:2.4-node - working_directory: ~/cycamore + working_directory: ~/recyle steps: - checkout - setup_remote_docker diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 95f525c9..4ce231c1 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,11 +1,11 @@ package: - name: cycamore + name: recyle version: 0.0 # Only use fn and url for polyphemus compatability source: - fn: cycamore-src.tar.gz # ["TRAVIS" not in environ] - url: https://github.com/cyclus/cycamore/archive/develop.tar.gz # ["TRAVIS" not in environ] + fn: recyle-src.tar.gz # ["TRAVIS" not in environ] + url: https://github.com/cyclus/recyle/archive/develop.tar.gz # ["TRAVIS" not in environ] path: .. # ["TRAVIS" in environ] requirements: diff --git a/conda-recipe/post-link.sh b/conda-recipe/post-link.sh index 4516fcf9..6d450f46 100644 --- a/conda-recipe/post-link.sh +++ b/conda-recipe/post-link.sh @@ -1,4 +1,4 @@ -# This script replaces the cycamore_unit_tests commands with a simple +# This script replaces the recyle_unit_tests commands with a simple # wrapper that will modify the user's environment as needed to point # cyclus-sepcific envrionment variables to the conda install location $PREFIX. # Conda packaging has three phases which come to a head here. @@ -18,7 +18,7 @@ echo "post-link.sh, PREFIX: $PREFIX" # The library path modifications are here because cyclus installs # libgtest and libbaseagentunittests into the lib/cyclus directory. # We make this directory the last possible location to be searched. -mv $PREFIX/bin/cycamore_unit_tests $PREFIX/bin/cycamore_unit_tests_base +mv $PREFIX/bin/recyle_unit_tests $PREFIX/bin/recyle_unit_tests_base echo "#!/bin/bash export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:$PREFIX/lib/cyclus\" export DYLD_FALLBACK_LIBRARY_PATH=\"\$DYLD_FALLBACK_LIBRARY_PATH:$PREFIX/lib/cyclus\" @@ -29,6 +29,6 @@ fi if [ -z \"\$CYCLUS_RNG_SCHEMA\" ]; then export CYCLUS_RNG_SCHEMA=\"$PREFIX/share/cyclus/cyclus.rng.in\" fi -$PREFIX/bin/cycamore_unit_tests_base \$* -" > $PREFIX/bin/cycamore_unit_tests -chmod 755 $PREFIX/bin/cycamore_unit_tests +$PREFIX/bin/recyle_unit_tests_base \$* +" > $PREFIX/bin/recyle_unit_tests +chmod 755 $PREFIX/bin/recyle_unit_tests diff --git a/docker/deb-ci/Dockerfile_template b/docker/deb-ci/Dockerfile_template index 22dc5524..5ac9bfff 100644 --- a/docker/deb-ci/Dockerfile_template +++ b/docker/deb-ci/Dockerfile_template @@ -35,10 +35,10 @@ RUN wget -r --no-parent -A 'cyclus_1.5.0_*_ubuntu.CYCAMORE_UBUNTU_MAJOR_VERSION. run mv dory.fuelcycle.org:4848/* ./; rm -rf dory.fuelcycle.org:4848 RUN dpkg -i cyclus_1.5.0_*_ubuntu.CYCAMORE_UBUNTU_MAJOR_VERSION.04.deb -COPY . /cycamore -WORKDIR cycamore +COPY . /recyle +WORKDIR recyle RUN mkdir -p deb -WORKDIR /cycamore/deb +WORKDIR /recyle/deb RUN cmake -DCPACK_PACKAGING_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local -DCPACK_HASH_NAME=CYCAMORE_REPO_HASH -DCPACK_SYSTEM_NAME=ubuntu.CYCAMORE_UBUNTU_MAJOR_VERSION.04 .. # Build the deb file in the docker container diff --git a/docker/deb-ci/build_upload_deb.sh b/docker/deb-ci/build_upload_deb.sh index 14960db4..3a80978e 100755 --- a/docker/deb-ci/build_upload_deb.sh +++ b/docker/deb-ci/build_upload_deb.sh @@ -11,6 +11,6 @@ sed -i s/CYCAMORE_REPO_HASH/`git rev-parse --short HEAD`/g Dockerfile docker build -t deb/ubuntu-${1} . # build cyclus against ubuntu 14.04 in the docker container docker create --name=deb-${1}.04 deb/ubuntu-${1} # build deb in docker -docker cp deb-${1}.04:/cycamore/deb ./ # extract deb -scp ./deb/cycamore_*_ubuntu.${1}.04.deb root@dory.fuelcycle.org:./cyclus-deb/ # push the deb on dory +docker cp deb-${1}.04:/recyle/deb ./ # extract deb +scp ./deb/recyle_*_ubuntu.${1}.04.deb root@dory.fuelcycle.org:./cyclus-deb/ # push the deb on dory rm -rf deb # clean the deb folder diff --git a/docker/master-ci/Dockerfile b/docker/master-ci/Dockerfile index 3698bf11..a702ab0f 100644 --- a/docker/master-ci/Dockerfile +++ b/docker/master-ci/Dockerfile @@ -1,7 +1,7 @@ FROM cyclus/cyclus:latest -COPY . /cycamore -WORKDIR /cycamore +COPY . /recyle +WORKDIR /recyle ENV PATH="/root/.local/bin:${PATH}" RUN python install.py -j 2 --build-type=Release \ -DBLAS_LIBRARIES="/opt/conda/lib/libblas.so" \ diff --git a/docker/release-ci/Dockerfile b/docker/release-ci/Dockerfile index f53c2405..76eac0b5 100644 --- a/docker/release-ci/Dockerfile +++ b/docker/release-ci/Dockerfile @@ -1,10 +1,10 @@ FROM cyclus/cyclus:stable -COPY . /cycamore -WORKDIR /cycamore +COPY . /recyle +WORKDIR /recyle RUN mkdir Release -WORKDIR /cycamore/Release +WORKDIR /recyle/Release RUN cmake .. -DCMAKE_BUILD_TYPE=Release RUN make -j2 && make install diff --git a/src/recycle_version.h b/src/recycle_version.h deleted file mode 100644 index 6ed8e0a9..00000000 --- a/src/recycle_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef RECYCLE_SRC_VERSION_H_ -#define RECYCLE_SRC_VERSION_H_ - -#define RECYCLE_VERSION_MAJOR 0 -#define RECYCLE_VERSION_MINOR 0 -#define RECYCLE_VERSION_MICRO 1 -#define RECYCLE_VERSION "0.0.0-5-g64dcbb2" - -#endif // RECYCLE_SRC_VERSION_H_ diff --git a/tests/README.rst b/tests/README.rst index c63e89fa..9573c2ee 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -10,7 +10,7 @@ Dependencies Running Tests ------------- -To run the regression tests from the cycamore/tests: +To run the regression tests from the recyle/tests: .. code-block:: bash @@ -43,13 +43,13 @@ Next, rename the databases: .. code-block:: bash - $ rename 's/^[^_]*_[^_]*_(.*)/__$1/' *.h5 + $ rename 's/^[^_]*_[^_]*_(.*)/__$1/' *.h5 where * is replaced by the current version tag name for cyclus (e.g. v0.1) -* is replaced by the current version tag name for cycamore +* is replaced by the current version tag name for recyle (e.g. v0.1) so that, using the above examples, the command is diff --git a/tests/input/dynamic_capacitated.xml b/tests/input/dynamic_capacitated.xml index a9ff2649..e8d42c8c 100644 --- a/tests/input/dynamic_capacitated.xml +++ b/tests/input/dynamic_capacitated.xml @@ -8,10 +8,10 @@ 1001 - cycamoreSink - cycamoreSource + recyleSink + recyleSource agentsNullRegion - cycamoreDeployInst + recyleDeployInst diff --git a/tests/input/growth.xml b/tests/input/growth.xml index 63034f02..919c087e 100644 --- a/tests/input/growth.xml +++ b/tests/input/growth.xml @@ -9,19 +9,19 @@ - cycamore + recyle Source - cycamore + recyle Sink - cycamore + recyle GrowthRegion - cycamore + recyle ManagerInst diff --git a/tests/test_regression.py b/tests/test_regression.py index c079cd07..3544186a 100644 --- a/tests/test_regression.py +++ b/tests/test_regression.py @@ -116,8 +116,8 @@ def __init__(self, *args, **kwargs): def setUp(self): super(_PhysorEnrichment, self).setUp() tbl = self.agent_entry - self.rx_id = self.find_ids(":cycamore:Reactor", tbl) - self.enr_id = self.find_ids(":cycamore:Enrichment", tbl) + self.rx_id = self.find_ids(":recyle:Reactor", tbl) + self.enr_id = self.find_ids(":recyle:Enrichment", tbl) def test_deploy(self): assert_equal(len(self.rx_id), 2) @@ -190,9 +190,9 @@ def setUp(self): # identify each reactor and supplier by id tbl = self.agent_entry - rx_id = self.find_ids(":cycamore:Reactor", tbl) + rx_id = self.find_ids(":recyle:Reactor", tbl) self.r1, self.r2, self.r3 = tuple(rx_id) - s_id = self.find_ids(":cycamore:Source", tbl) + s_id = self.find_ids(":recyle:Source", tbl) self.smox = self.transactions[0]["SenderId"] s_id.remove(self.smox) self.suox = s_id[0] @@ -294,8 +294,8 @@ def setUp(self): self.depl_time = self.to_ary(self.agent_entry, "EnterTime") self.exit_time = self.to_ary(self.agent_exit, "ExitTime") self.exit_ids = self.to_ary(self.agent_exit, "AgentId") - self.source_id = self.find_ids(":cycamore:Source", self.agent_entry) - self.sink_id = self.find_ids(":cycamore:Sink", self.agent_entry) + self.source_id = self.find_ids(":recyle:Source", self.agent_entry) + self.sink_id = self.find_ids(":recyle:Sink", self.agent_entry) # Check transactions self.sender_ids = self.to_ary(self.transactions, "SenderId")