Fix CI. (#49)

* Verbose pip. * Fix build.
ast0815 · Feb 6, 2023 · 6f4c04c · 6f4c04c
1 parent 0c27717
commit 6f4c04c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/pythontests.yml b/.github/workflows/pythontests.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Install dependencies
       run: python -m pip install -r requirements.txt -r test-requirements.txt -r documentation-requirements.txt
     - name: Install package
-      run: PYTHONPATH=./:$PYTHONPATH python -m pip install .
+      run: python -m pip -v install -e .
     - name: Run tests
       run: ./run_tests.sh
     - name: Build documentation

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
 # Ignore virtualenv
 /ENV
-/remu/version.py
-/remu.egg-info
+_version.py
+*.egg-info
 /dist
+/build
 .coverage
 *.pyc
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "setuptools-scm"]
+requires = ["setuptools", "setuptools-scm[toml]"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -47,11 +47,8 @@ mcmc = [
 [project.urls]
 Home = "https://remu.readthedocs.io/en/latest/"
 
-[tool.setuptools]
-zip-safe = true
-
-[tool.setuptools.packages.find]
-include = ["remu"]
+[tool.setuptools_scm]
+write_to = "src/remu/_version.py"
 
 [tool.setuptools.dynamic]
-version = {attr = "remu.version.version"}
+version = {attr = "remu.__version__"}
diff --git a/remu/__init__.py → src/remu/__init__.py b/remu/__init__.py → src/remu/__init__.py
@@ -4,3 +4,8 @@
 events and response matrices.
 
 """
+
+try:
+    from ._version import __version__
+except ImportError:
+    __version__ = None
diff --git a/remu/binning.py → src/remu/binning.py b/remu/binning.py → src/remu/binning.py
diff --git a/remu/likelihood.py → src/remu/likelihood.py b/remu/likelihood.py → src/remu/likelihood.py
diff --git a/remu/likelihood_utils.py → src/remu/likelihood_utils.py b/remu/likelihood_utils.py → src/remu/likelihood_utils.py
diff --git a/remu/matrix_utils.py → src/remu/matrix_utils.py b/remu/matrix_utils.py → src/remu/matrix_utils.py
diff --git a/remu/migration.py → src/remu/migration.py b/remu/migration.py → src/remu/migration.py
diff --git a/remu/plotting.py → src/remu/plotting.py b/remu/plotting.py → src/remu/plotting.py