Merge pull request #203 from fusion-energy/develop

packaging and component updates

.github/workflows/anaconda-publish.yml

@@ -25,6 +25,5 @@ jobs:
           ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
         run: |
             conda mambabuild conda -c fusion-energy -c cadquery -c conda-forge --config-file conda/conda_build_config.yaml
-            conda convert /opt/conda/conda-bld/linux-64/*.tar.bz2 --platform osx-64
-            conda convert /opt/conda/conda-bld/linux-64/*.tar.bz2 --platform win-64
+            conda convert /opt/conda/conda-bld/linux-64/*.tar.bz2 --platform osx-64 --platform win-64 -o /opt/conda/conda-bld/
             anaconda upload -f /opt/conda/conda-bld/*/*.tar.bz2

.github/workflows/ci_with_docker_build.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build with Docker
-        run: docker build -t paramak --build-arg cq_version=2.1 .
+        run: docker build -t paramak --build-arg cq_version=master .
 
       - name: Run unit tests
         run: docker run --rm paramak pytest ./tests

.github/workflows/ci_with_install.yml

@@ -20,14 +20,19 @@ jobs:
   testing:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/fusion-energy/paramak:dependencies
+      image: ghcr.io/fusion-energy/paramak_cq_master:dependencies
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
       - name: install package
         run: |
           pip install --upgrade pip
+          pip install .
+          python -c "import paramak"
+
+      - name: install package with tests
+        run: |
           pip install .[tests]
 
       - name: Run tests

.github/workflows/conda-build-test.yml

@@ -0,0 +1,29 @@
+name: conda-build-test
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - develop
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: continuumio/miniconda3:4.10.3
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up conda
+        run: |
+            apt-get --allow-releaseinfo-change update
+            apt install -y libgl1-mesa-glx
+            conda install -y anaconda-client conda-build
+            conda config --set anaconda_upload no
+            conda install boa -c conda-forge
+      - name: Build and test
+        env:
+          GIT_DESCRIBE_TAG: 0.1
+        run: |
+            conda mambabuild conda -c fusion-energy -c cadquery -c conda-forge --config-file conda/conda_build_config.yaml

.github/workflows/docker_publish.yml

@@ -48,14 +48,14 @@ jobs:
             cq_version=master
             paramak_version=${{ github.ref_name }}
 
-      - name: Build and push dependencies Docker image CQ=2.1
+      - name: Build and push dependencies Docker image CQ=master
         uses: docker/build-push-action@v2
         with:
           push: true
           target: dependencies
           tags: ghcr.io/fusion-energy/paramak:dependencies
           build-args: |
-            cq_version=2.1
+            cq_version=master
             paramak_version=${{ github.ref_name }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
@@ -74,4 +74,4 @@ jobs:
           push: true
           tags: ghcr.io/fusion-energy/paramak
           build-args: |
-            cq_version=2.1
+            cq_version=master

.github/workflows/black.yml → .github/workflows/pep8_linting.yml

@@ -20,10 +20,14 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - name: Install black
+      - name: Lint code
         run: |
           python -m pip install --upgrade pip
-          pip install black
+          pip install flake8
+          flake8 . --show-source --statistics --max-line-length 120
+      - name: Install black
+        run: |
+          pip install black==22.1.0
       - name: Run black
         run: |
           black .

.github/workflows/test_demos.yml

@@ -15,7 +15,7 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/fusion-energy/paramak:dependencies
+      image: ghcr.io/fusion-energy/paramak_cq_master:dependencies
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 22.1.0
+    hooks:
+      - id: black
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace

CITATION.cff

@@ -40,8 +40,13 @@ authors:
   given-names: "Liam"
 - family-names: "Peter"
   given-names: "Hill"
-  orcid: "https://orcid.org/0000-0003-3092-1858 "
+  orcid: "https://orcid.org/0000-0003-3092-1858"
+- family-names: "Frank"
+  given-names: "Schoofs"
+- family-names: "Steve"
+  given-names: "Lilley"
+  orcid: "https://orcid.org/0000-0002-0547-9378"
 title: "The Paramak: automated parametric geometry construction for fusion reactor designs"
-version: 0.6.5
+version: 0.7.1
 date-released: 2021-1-6
 url: "https://github.com/fusion-energy/paramak"

Dockerfile

@@ -56,7 +56,7 @@ RUN echo installing CadQuery version $cq_version && \
     conda install -c conda-forge moab && \
     conda install -c conda-forge gmsh && \
     conda install -c conda-forge python-gmsh && \
-    pip install jupyter-cadquery==2.2.0 && \
+    pip install jupyter-cadquery && \
     conda clean -afy
 
 

conda/conda_build_config.yaml

@@ -1,8 +1,6 @@
 python:
     - 3.8
-    - 3.7
-    - 3.6
+    - 3.9
+    # - 3.10 can't solve environment currently as not all dependencies support 3.10
 cadquery:
-    - 2.1
-moab:
-    - 5.3.1
+    - master

conda/meta.yaml

@@ -18,20 +18,11 @@ requirements:
   run:
     - python {{ python }}
     - cadquery {{ cadquery }}
-    - matplotlib
     - mpmath
-    - numpy
     - plasmaboundaries
     - plotly
-    - scipy
-    - sympy
-    - nbformat
-    - nbconvert
-    - ipywidgets
-    # - gmsh [not win] TODO include in with cq 2.2 release
-    # - moab [not win] TODO include in with cq 2.2 release
-    # - brep_to_h5m import [not win] TODO include in with cq 2.2 release
-    # - brep_part_finder [not win] TODO include in with cq 2.2 release
+    - brep_part_finder  # [not win]
+    - brep_to_h5m  # [not win]
     # - jupyter-cadquery not available on conda
 
 test:
@@ -43,18 +34,17 @@ test:
     - tests
   requires:
     - pytest
-    - pytest-cov
-    # - dagmc_h5m_file_inspector [not win] TODO include in with cq 2.2 release
+    - dagmc_h5m_file_inspector  # [not win]
   source_files:
     - tests/
-    # - tests_examples/  # TODO include if cadquery_jupyter gets a conda install
-    # - tests_h5m/   # TODO include in with cq 2.2 release
     - examples/
+    - tests_h5m/  # [not win]
+    # - tests_examples/  # TODO include if cadquery_jupyter gets a conda install
   commands:
+    - pytest -v tests_h5m  # [not win]
     - pytest -v tests
+    # - pytest -v tests_show  # TODO include if cadquery_jupyter gets a conda install
     # - pytest -v tests_examples  # TODO include if cadquery_jupyter gets a conda install
-    # - tests_h5m   # TODO include in with cq 2.2 release
-    # - tests_show  # TODO include if cadquery_jupyter gets a conda install
 
 about:
   home: "https://github.com/fusion-energy/paramak"