Merge branch 'dev' into test-full

.github/workflows/benchmark.yml

@@ -23,10 +23,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        python setup.py develop
-        pip install pytest-benchmark
+        python -m pip install .[tests]
     - name: Benchmark with pytest
       run: |
         pytest tests/test_db_benchmark.py --benchmark-json output.json

.github/workflows/coveralls.yml

@@ -26,9 +26,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        python -m pip install --editable .
+        python -m pip install flake8
+        python -m pip install --editable .[tests]
         cd tests/cannonsim/src; make; cd ../../..
         pip install pytest-cov
         pip install coveralls

.github/workflows/pdocs.yml

@@ -21,8 +21,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        python -m pip install --editable .
+        python -m pip install setuptools
+        python -m pip install --editable .[docs]
         cd tests/cannonsim/src; make; cd ../../.. 
         pip install pdoc
     - name: Checkout

.github/workflows/python-package.yml

@@ -26,9 +26,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        python -m pip install --editable .
+        python -m pip install flake8
+        python -m pip install --editable .[tests]
         cd tests/cannonsim/src; make; cd ../../..
         pip install pytest-cov
         pip install coveralls

.github/workflows/pythonpublish.yml

@@ -21,11 +21,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install build twine
+    - name: Build package
+      run: python -m build --sdist --wheel
+    - name: Check package
+      run: python -m twine check dist/*
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
         twine upload dist/*

.gitignore

@@ -21,3 +21,4 @@ pep.sh
 *.csv
 env/
 .ipynb_checkpoints/
+easyvvuq/_version.py

.readthedocs.yaml

@@ -27,9 +27,9 @@ sphinx:
 #    - pdf
 #    - epub
 
-# Optional but recommended, declare the Python requirements required
-# to build your documentation
-# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-# python:
-#    install:
-#    - requirements: docs/requirements.txt
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

easyvvuq/__init__.py

@@ -11,9 +11,14 @@
 from . import analysis
 from . import comparison
 
-# First make sure python version is 3.6+
-assert sys.version_info >= (3, 6), (f"Python version must be >= 3.6,"
-                                    f"found {sys.version_info}")
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("easyvvuq")
+except PackageNotFoundError:
+    from setuptools_scm import get_version  # type: ignore[import]
+
+    __version__ = get_version(root="..", relative_to=__file__)
 
 __copyright__ = """
 
@@ -36,6 +41,3 @@
 
 """
 __license__ = "LGPL"
-
-from . import _version
-__version__ = _version.get_versions()['version']