Preparing new version (#11)

* first commit * wip * change python versions and poetry * change cmake version * change python version * change python version * tf version for build * tf version * tf version * debugging with gpt * debugging with gpt v2 * debugging with gpt v3 * update mypy * forgot the lock * black changes * versioning * update pyproject * ignore banded mypy * temporary fix: skip test * black * putting header back * poetry task fix / rm setup.py / more python tested upon push * minor * change tensorflow version range * forgot the lock * changing tf version * update poetry * update worflow to force the lock to be regenerate * update worflow to force the lock to be regenerate v2 * set matching python / tf * set matching python / tf * set looser dependencies for np / tf / py * set looser dependencies for np / tf / py * set looser dependencies for np / tf / py v2 * set looser dependencies for np / tf / py v3 * reduce range and change tf/py version * workflow adding quotes to versions * exception for python 3.8 * exception for python 3.8 v2 * looser version for mypy * now numpy * Revert "black" This reverts commit ccd3c82. * revert to ccd3c82 * playing with versions * reintroducing matrix python * version fix * fixing versions tf * black + version * 3.11 * markers * markers weird py3.7 * py3.11 tf2.16 * test * test back * remove 3.11 from list * fix black * fix: john comments * py3.7 * simplifying github workflow * gh worflow: add back manual build * gh worflow: revert to what works * updating release file * update version (#8) * Update scipy dependency (#9) * Update scipy dependency * Typo --------- Co-authored-by: Uri Granta <[email protected]> * Update pyproject.toml (#10) commenting flags * moving cmake config out of pyproject * black * update workflow trigger * Update upload-pypi.yaml removing trigger filter by branch --------- Co-authored-by: Vincent Adam <[email protected]> Co-authored-by: uri-granta <[email protected]> Co-authored-by: Uri Granta <[email protected]>
secondmind-labs · Jul 4, 2024 · 8d6136a · 8d6136a
1 parent 3a765fc
commit 8d6136a
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 29 deletions.
diff --git a/.github/workflows/upload-pypi.yaml b/.github/workflows/upload-pypi.yaml
@@ -17,6 +17,7 @@ name: Upload-PyPI
 
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - "v*.*.*"
@@ -72,7 +73,7 @@ jobs:
         run: poetry run task test
 
   pypi:
-    # needs: check-and-test
+    needs: check-and-test
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,6 @@ __pycache__
 
 # Don't commit the generate Cython library
 banded_matrices.*.so
+
+# PyEnv
+.python-version
diff --git a/.python-version b/.python-version
diff --git a/build.py b/build.py
@@ -68,6 +68,7 @@ def build_cmake(self, ext):
             f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={str(ext_dir / ext.name / 'lib')}",
             f"-DCMAKE_RUNTIME_OUTPUT_DIRECTORY={str(ext_dir / ext.name / 'bin')}",
             f"-DCMAKE_VERBOSE_MAKEFILE:BOOL=on",
+            "-DCMAKE_CXX_STANDARD=14",
         ]
 
         os.chdir(str(build_temp))

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,7 +54,10 @@ pytest-isort = "^1.0.0"
 pytest-mock = "^3.1.1"
 pytest-mypy = "^0.6.1"
 pytest-pylint = "^0.17.0"
-scipy = "^1.5.4"
+scipy = [
+    { version = "^1.5.4", markers = "python_version >= '3.7' and python_version < '3.10'" },
+    { version = "^1.8.1", markers = "python_version >= '3.10' and python_version < '3.12'" }
+]
 taskipy = "^1.2.0"
 
 
@@ -91,4 +94,3 @@ line_length = 95
 [build-system]
 requires = ["poetry>=0.12", "cmake", "setuptools"] #, "tensorflow>=2.8.0,<2.9.0", "cmake"]
 build-backend = "poetry.masonry.api"
-flags = ["-DCMAKE_CXX_STANDARD=14"]