Merge branch 'cyclus:main' into storage_packaging

CHANGELOG.rst

@@ -2,7 +2,23 @@
 cycamore Change Log
 =================
 
-.. current developments
+Since last release
+======================
+
+**Added:**
+
+**Changed:**
+
+* Rely on `python3` in environment instead of `python` (#602)
+
+**Fixed:**
+
+**Removed:**
+
+
+v1.6.0
+====================
+
 **Added:**
 
 * Downstream testing in CI workflows (#573, #580, #582, #583)
@@ -22,6 +38,8 @@ cycamore Change Log
 * Update build procedure to link against Cyclus' cython generated libraries if needed (#596)
 * Minor modifications for compatibility with the latest GTest library (#598)
 * Remove FindCyclus.cmake from this repo since it is installed with Cyclus (#597)
+* Default to a Release build when installing via python script (#600)
+* Update pytests to skip appropriately when COIN is not supported (#601)
 
 v1.5.5
 ====================
@@ -46,8 +64,6 @@ v1.5.4
 - All cycamore archetypes have been edited to now include Cyclus::toolkit::Position.
 
 
-
-
 v1.5.3
 ====================
 

CMakeLists.txt

@@ -11,7 +11,7 @@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 ENDIF()
 
 # This project name is cycamore.
-PROJECT(CYCAMORE VERSION 1.5.5)
+PROJECT(CYCAMORE VERSION 1.6.0)
 
 # check for and enable c++11 support (required for cyclus)
 INCLUDE(CheckCXXCompilerFlag)

DEPENDENCIES.rst

@@ -20,7 +20,7 @@ Dependencies
 ====================   ==================
 Package                Minimum Version
 ====================   ==================
-`Cyclus`               1.5
+`Cyclus`               1.6
 ====================   ==================
 
 

INSTALL.rst

@@ -17,7 +17,7 @@ Cycamore's only dependency is the Cyclus Core.
 ====================   ==================
 Package                Minimum Version
 ====================   ==================
-`Cyclus`               1.5
+`Cyclus`               1.6
 ====================   ==================
 
 There are a number of ways to install the Cyclus core:
@@ -45,7 +45,7 @@ Run the install script:
 
 .. code-block:: bash
   
-  python install.py
+  python3 install.py
 
 
 If you successfully followed the instructions above, then the Cycamore library
@@ -130,7 +130,7 @@ installation flag. The otherwise identical process would look like:
 
 .. code-block:: bash
 
-    .../cycamore$  python install.py --coin_root=path/to/coin
+    .../cycamore$  python3 install.py --coin_root=path/to/coin
 
 
 CMake Cycamore Installation

README.rst

@@ -65,7 +65,7 @@ github is fairly straightforward:
 
 - Clone the Cyclus Repo: ``git clone https://github.com/cyclus/cycamore.git``,
 
-- to install Cyclus locally (in ``~/.local/``) just run: ``python install.py``
+- to install Cyclus locally (in ``~/.local/``) just run: ``python3 install.py``
   from cycamore folder,
 
 - finally, add the following Cyclus installation path (``~/.local/cyclus``) to

docker/Dockerfile

@@ -8,7 +8,7 @@ ARG make_cores=2
 COPY . /cycamore
 WORKDIR /cycamore
 
-RUN python install.py -j ${make_cores} --build-type=Release --allow-milps
+RUN python3 install.py -j ${make_cores} --allow-milps
 
 FROM cycamore as deb-generation
 WORKDIR /cycamore/build
@@ -21,4 +21,4 @@ FROM cycamore as cycamore-test
 RUN cycamore_unit_tests
 
 FROM cycamore-test as cycamore-pytest
-RUN cd tests && python -m pytest
+RUN cd tests && python3 -m pytest

install.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 from __future__ import print_function, unicode_literals
 import os
 import sys
@@ -184,7 +184,8 @@ def main():
     parser.add_argument('--cmake_prefix_path', help=cmake_prefix_path)
 
     build_type = "the CMAKE_BUILD_TYPE"
-    parser.add_argument('--build-type', '--build_type', help=build_type)
+    parser.add_argument('--build-type', '--build_type', help=build_type,
+                        default='Release')
 
     parser.add_argument('-D', metavar='VAR', action='append',
                         help='Set enviornment variable(s).')

tests/README.rst

@@ -37,7 +37,7 @@ Next, generate the new databases:
 
 .. code-block:: bash
 
-  $ python ref.py gen
+  $ python3 ref.py gen
 
 Next, rename the databases:
 
@@ -93,4 +93,4 @@ those tables. See the module's help:
 
 .. code-block:: python
 
-  $ python analysis.py -h
+  $ python3 analysis.py -h

tests/run_inputs.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import subprocess
@@ -42,7 +42,7 @@ def check_inputs():
 
 def print_usage() :
     """This prints the proper way to treat the command line interface"""
-    print(""" Usage: python run_inputs.py\n 
+    print(""" Usage: python3 run_inputs.py\n 
             Allowed Options : \n 
             -v arg                    output log verbosity. \n 
                                 

tests/test_regression.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 import os
 import uuid
 import sqlite3
@@ -13,7 +13,7 @@
 from pytest import skip
 
 import helper
-from helper import check_cmd, run_cyclus, table_exist, cyclus_has_coin
+from helper import run_cyclus
 
 
 ALLOW_MILPS = Env().allow_milps
@@ -276,9 +276,8 @@ class TestDynamicCapacitated(TestRegression):
     """   
     @classmethod
     def setup_class(cls):
+        skip_if_dont_allow_milps()
         super(TestDynamicCapacitated, cls).setup_class("./input/dynamic_capacitated.xml")
-        if not cyclus_has_coin():
-            raise skip('Cyclus not compiled with COIN')
 
         # Find agent ids of source and sink facilities
         cls.agent_ids = cls.to_ary(cls.agent_entry, "AgentId")
@@ -380,9 +379,8 @@ class TestGrowth1(TestRegression):
     """
     @classmethod
     def setup_class(cls):
+        skip_if_dont_allow_milps()
         super(TestGrowth1, cls).setup_class("./input/growth.xml")
-        if not cyclus_has_coin():
-            raise skip('Cyclus not compiled with COIN')
 
     @classmethod
     def teardown_class(cls):
@@ -425,9 +423,8 @@ class TestGrowth2(TestRegression):
     """
     @classmethod
     def setup_class(cls):
+        skip_if_dont_allow_milps()
         super(TestGrowth2, cls).setup_class("../input/growth/deploy_and_manager_insts.xml")
-        if not cyclus_has_coin():
-            raise skip('Cyclus not compiled with COIN')
 
     @classmethod
     def teardown_class(cls):
@@ -465,9 +462,8 @@ class TestDeployInst(TestRegression):
     """        
     @classmethod
     def setup_class(cls):
+        skip_if_dont_allow_milps()
         super(TestDeployInst, cls).setup_class("../input/deploy_inst.xml")
-        if not cyclus_has_coin():
-            raise skip('Cyclus not compiled with COIN')
 
     @classmethod
     def teardown_class(cls):