Pull request review fixes 0.23

.github/workflows/docker_ci.yml

@@ -14,4 +14,4 @@ jobs:
    - name: Build and test with Docker
      run: |
        docker build -t paramak --build-arg include_neutronics=true --build-arg cq_version=2.1 --build-arg compile_cores=2 .
-       docker run --rm paramak  /bin/bash -c "cd .. && bash run_tests.sh && curl -s https://codecov.io/bash | bash"
+       docker run --rm paramak  /bin/bash -c "bash run_tests.sh && curl -s https://codecov.io/bash | bash"

Dockerfile

@@ -40,7 +40,7 @@
 # docker run --rm ukaea/paramak pytest /tests
 # docker run --rm ukaea/paramak  /bin/bash -c "cd .. && bash run_tests.sh"
 
-FROM continuumio/miniconda3
+FROM continuumio/miniconda3:4.9.2
 
 # By default this Dockerfile builds with the latest release of CadQuery 2
 ARG cq_version=2
@@ -213,5 +213,3 @@ COPY README.md README.md
 
 # using setup.py instead of pip due to https://github.com/pypa/pip/issues/5816
 RUN python setup.py install
-
-WORKDIR examples

DockerfileDependencies

@@ -40,7 +40,7 @@
 # docker run --rm ukaea/paramak pytest /tests
 # docker run --rm ukaea/paramak  /bin/bash -c "cd .. && bash run_tests.sh"
 
-FROM continuumio/miniconda3
+FROM continuumio/miniconda3:4.9.2
 
 # By default this Dockerfile builds with the latest release of CadQuery 2
 ARG cq_version=2

examples/example_parametric_reactors/make_animation.py

@@ -2,7 +2,7 @@
 them into gif animations using the command line tool convert, you will need to
 have imagemagick installed to convert the svg images to a gif animation """
 
-import os
+import subprocess
 
 import numpy as np
 import paramak
@@ -60,7 +60,8 @@ def rotate_single_reactor(number_of_images=100):
 
         print("made", str(i + 1), "models out of", str(number_of_images))
 
-    os.system("convert -delay 15 rotation_*.svg rotated.gif")
+    subprocess.check_call(
+        ["convert", "-delay", "15", "rotation_*.svg", "rotated.gif"])
 
     print("animation file made as saved as rotated.gif")
 
@@ -102,7 +103,8 @@ def make_random_reactors(number_of_images=11):
 
         print("made", str(i + 1), "models out of", str(number_of_images))
 
-    os.system("convert -delay 40 random_*.svg randoms.gif")
+    subprocess.check_call(
+        ["convert", "-delay", "40", "random_*.svg", "randoms.gif"])
 
     print("animation file made as saved as randoms.gif")
 

paramak/neutronics_utils.py

@@ -112,7 +112,7 @@ def add_stl_to_moab_core(
 
     group_set = moab_core.create_meshset()
     moab_core.tag_set_data(tags['category'], group_set, "Group")
-    print("mat:{}".format(material_name))
+
     moab_core.tag_set_data(
         tags['name'],
         group_set,

run_tests.sh

@@ -1,4 +1,6 @@
-pytest tests/test_neutronics_utils.py -v --cov=paramak --cov-append --cov-report term --cov-report xml
+#!/bin/bash
+
+pytest tests/test_neutronics_utils.py -v --cov=paramak --cov-report term --cov-report xml
 pytest tests/test_example_neutronics_simulations.py -v --cov=paramak --cov-append --cov-report term --cov-report xml
 pytest tests/test_utils.py -v --cov=paramak --cov-append --cov-report term --cov-report xml
 pytest tests/test_Shape.py -v --cov=paramak --cov-append --cov-report term --cov-report xml

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="paramak",
-    version="0.2.2",
+    version="0.2.3",
     author="The Paramak Development Team",
     author_email="jonathan.shimwell@ukaea.uk",
     description="Create 3D fusion reactor CAD models based on input parameters",

tests/test_parametric_reactors/test_BallReactor.py

@@ -37,7 +37,7 @@ def test_creation_with_narrow_divertor(self):
         assert self.test_reactor.solid is not None
         assert len(self.test_reactor.shapes_and_components) == 7
 
-    def test_creation_with_narrow_divertor(self):
+    def test_creation_with_wide_divertor(self):
         """Creates a BallReactor with a wide divertor and checks that the correct
         number of components are created."""