Merge pull request #278 from fusion-energy/develop

packaging update

.github/workflows/ci_with_install.yml

@@ -37,9 +37,9 @@ jobs:
 
       - name: Run tests
         run: |
-          pytest tests/tests_units -v --cov=paramak --cov-append --cov-report term --cov-report xml
-          pytest tests/tests_examples -v --cov=paramak --cov-append --cov-report term --cov-report xml
-          pytest tests/tests_show -v --cov=paramak --cov-append --cov-report term --cov-report xml
+          pytest tests/tests_units -v --cov=src/paramak --cov-append --cov-report term --cov-report xml
+          pytest tests/tests_examples -v --cov=src/paramak --cov-append --cov-report term --cov-report xml
+          pytest tests/tests_show -v --cov=src/paramak --cov-append --cov-report term --cov-report xml
 
       - name: Upload to codecov
         uses: codecov/codecov-action@v2

Dockerfile

@@ -72,11 +72,7 @@ ARG paramak_version=develop
 COPY run_tests.sh run_tests.sh
 COPY src src/
 COPY examples examples/
-
 COPY tests tests/
-
-COPY setup.py setup.py
-COPY setup.cfg setup.cfg
 COPY pyproject.toml pyproject.toml
 
 COPY README.md README.md

conda/meta.yaml

@@ -9,7 +9,7 @@ source:
 
 build:
   number: 0
-  script: python setup.py install --single-version-externally-managed --record=record.txt
+  script: python -m pip install --no-deps --ignore-installed .
 
 requirements:
   build:

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
-    "setuptools >= 65.4.1",
-    "setuptools_scm[toml] >= 7.0.5",
+    "setuptools>=65.5.0",
+    "setuptools_scm[toml]>=7.0.5"
 ]
 build-backend = "setuptools.build_meta"
 
@@ -20,17 +20,19 @@ authors = [
 ]
 license = {file = "LICENSE.txt"}
 requires-python = ">=3.8"
+keywords = ["python", "geometry", "reactor", "model", "cad", "fusion", "parametric", "dagmc", "openmc"]
 dependencies = [
     "plotly>=5.1.0",
     "scipy>=1.7.0",
     "sympy>=1.8",
     "numpy>=1.21.1",
     "matplotlib>=3.4.2",
     "plasmaboundaries>=0.1.8",
-    "jupyter-client < 7",
+    "jupyter-client<7",
     "jupyter-cadquery>=3.2.0",
     "brep_part_finder>=0.5.0",
     "brep_to_h5m>=0.4.0",
+    "setuptools_scm[toml]>=7.0.5"
 ]
 
 [project.urls]
@@ -41,6 +43,20 @@ dependencies = [
 [tool.setuptools_scm]
 write_to = "src/_version.py"
 
+[project.optional-dependencies]
+tests = [
+    "pytest>=5.4.3",
+    "pytest-cov>=2.12.1",
+    "pytest-runner>=5.3.1",
+    "dagmc_h5m_file_inspector>=0.5.0"
+]
+docs = [
+    "sphinx>=4.1.2",
+    "sphinx_rtd_theme",
+    "sphinx_autodoc_typehints",
+    "sphinxcadquery"
+]
+
 [tool.black]
 line-length = 120