Merge pull request #29 from fusion-energy/merging_packages

Merging packages
fusion-energy · May 30, 2023 · 2f95f8b · 2f95f8b
2 parents b1ef2b8 + fd7b681
commit 2f95f8b
Show file tree

Hide file tree

Showing 35 changed files with 13,719 additions and 233 deletions.
diff --git a/.github/workflows/anaconda-publish.yml b/.github/workflows/anaconda-publish.yml
@@ -23,7 +23,7 @@ jobs:
         env:
           ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
         run: |
-            conda build conda -c fusion-energy -c cadquery -c conda-forge --config-file conda/conda_build_config.yaml
+            conda build conda -c conda-forge --config-file conda/conda_build_config.yaml
             conda convert /opt/conda/conda-bld/linux-64/*.tar.bz2 --platform osx-64
             anaconda upload -f /opt/conda/conda-bld/*/*.tar.bz2
 

diff --git a/.github/workflows/ci_with_install.yml b/.github/workflows/ci_with_install.yml
@@ -43,77 +43,22 @@ jobs:
           pip install .
           python -c "import cad_to_dagmc"
 
-      - name: Run cad creation tests
-        run: |
-          pip install .[tests]
-          pytest tests/test_h5m_creation.py -v
-
-      - name: create stp files
+      - name: run examples
         run: |
           cd examples
           python create_stp_files_for_examples.py
-
-
-      - name: Run example cadquery_assembly
-        run: |
-          cd examples
           python cadquery_assembly.py
-
-
-      - name: Run example cadquery_compound
-        run: |
-          cd examples
           python cadquery_compound.py
-
-
-      - name: Run example cadquery_object_and_stp_file
-        run: |
-          cd examples
           python cadquery_object_and_stp_file.py
-
-
-      - name: Run example cadquery_text
-        run: |
-          cd examples
           python cadquery_text.py
-
-
-      - name: Run example curved_cadquery_object
-        run: |
-          cd examples
           python curved_cadquery_object.py
-
-
-      - name: Run example multiple_cadquery_objects
-        run: |
-          cd examples
           python multiple_cadquery_objects.py
-
-
-      - name: Run example multiple_stp_files
-        run: |
-          cd examples
           python multiple_stp_files.py
-
-
-      - name: Run example single_stp_file_multiple_volumes.py
-        run: |
-          cd examples
           python single_stp_file_multiple_volumes.py
-
-
-      - name: Run example single_cadquery_object
-        run: |
-          cd examples
           python single_cadquery_object.py
-
-
-      - name: Run example single_stp_file
-        run: |
-          cd examples
           python single_stp_file.py
 
-      - name: Run simulation tests
+      - name: Run pytest
         run: |
           pip install .[tests]
-          pytest tests/test_h5m_in_simulation.py -v
+          pytest tests -v
diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml
diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
diff --git a/conda/meta.yaml b/conda/meta.yaml
diff --git a/environment.yml b/environment.yml
@@ -0,0 +1,18 @@
+
+name: env_neutronics
+channels:
+  - conda-forge
+dependencies:
+  - python=3.11
+  - cad_to_dagmc
+  - cadquery=2.2.0
+  - occt=7.7.0
+  - gmsh
+  - python-gmsh
+  - moab
+  - trimesh
+  - openmc=0.13.3=dagmc*
+  - networkx
+  - pip
+  - pip:
+    - openmc_data_downloader
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,8 +19,8 @@ classifiers = [
 ]
 dependencies = [
     "cadquery>=2.2.0",
-    "brep_to_h5m>=0.4.2",
-    "brep_part_finder>=0.5.2",
+    "trimesh",
+    "networkx",
 ]
 dynamic = ["version"]
 
@@ -32,7 +32,6 @@ write_to = "src/_version.py"
 [project.optional-dependencies]
 tests = [
     "pytest",
-    "dagmc_h5m_file_inspector",
     "openmc_data_downloader"
 ]
 

diff --git a/src/cad_to_dagmc/__init__.py b/src/cad_to_dagmc/__init__.py
@@ -14,3 +14,6 @@
 __all__ = ["__version__"]
 
 from .core import CadToDagmc
+from .vertices_to_h5m import *
+from .brep_part_finder import *
+from .brep_to_h5m import *