Merge branch 'v1.5.0-release'

cyclus · Dec 13, 2016 · 39bf0f5 · 39bf0f5
2 parents 569753f + 830efd0
commit 39bf0f5
Show file tree

Hide file tree

Showing 39 changed files with 255 additions and 2,957 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Dockerfile b/Dockerfile
diff --git a/README.rst b/README.rst
@@ -40,7 +40,7 @@ Then build and install:
 .. code-block:: bash
 
     $ cd cymetric
-    $ python setup.py install --user
+    $ python setup.py install
 
 Next, run the tests to ensure everything is working properly:
 

diff --git a/circle.yml b/circle.yml
@@ -4,6 +4,8 @@ machine:
 
 dependencies:
   override:
+    # build cymetric:latest docker container
+    - docker/cymetric-ci/build_dockerfile_cymetric.sh latest
     - docker build -t cyclus/cymetric:latest .
 
 test:
@@ -14,17 +16,25 @@ deployment:
   develop:
     branch: develop
     commands:
-        - docker build -t cyclus/cymetric-deps:latest docker/cymetric-deps
-        - docker build -t cyclus/cymetric:latest .
         - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+        #build cymetric-deps:latest docker container and push it
+        - docker/cymetric-deps/build_dockerfile_deps.sh latest
+        - docker build -t cyclus/cymetric-deps:latest .
         - docker push cyclus/cymetric-deps:latest
+        #build cymetric:latest docker container and push it
+        - docker/cymetric-ci/build_dockerfile_cymetric.sh latest
+        - docker build -t cyclus/cymetric:latest .
         - docker push cyclus/cymetric:latest
 
   master:
     branch: master
     commands:
-        - docker build -t cyclus/cymetric-deps:stable docker/cymetric-deps
-        - docker build -t cyclus/cymetric:stable .
         - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+        #build cymetric-deps:stable docker container and push it
+        - docker/cymetric-deps/build_dockerfile_deps.sh stable
+        - docker build -t cyclus/cymetric-deps:stable .
         - docker push cyclus/cymetric-deps:stable
+        #build cymetric-ci:stable docker container and push it
+        - docker/cymetric-ci/build_dockerfile_cymetric.sh stable
+        - docker build -t cyclus/cymetric:stable .
         - docker push cyclus/cymetric:stable
diff --git a/cmake/CymetricMacros.cmake b/cmake/CymetricMacros.cmake
diff --git a/cmake/FindCyclus.cmake b/cmake/FindCyclus.cmake