From 91c1ef6c04f4a6d978306efd321597c6265f1de8 Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Thu, 18 Apr 2024 14:43:56 -0700 Subject: [PATCH 1/8] add python 3.12 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 88c7729..466b6c0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, macos-latest] steps: From 5a1a89122eb6f3fef28bf6f7d5d429650c9dba8e Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Thu, 18 Apr 2024 14:44:12 -0700 Subject: [PATCH 2/8] update the requirements in accordance to py 3.12 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3f70e6b..86122e8 100644 --- a/setup.py +++ b/setup.py @@ -8,8 +8,8 @@ requirements = [ "numpy>=1.21.6", - "scipy==1.10.0", - "autograd==1.5", + "scipy>=1.10.0", + "autograd>=1.5", "semantic_version~=2.10", "tqdm>=4.64.0", "requests>=2.31.0", From 584ef2f0fd42948a91b56f786cc5ea4de34d46ea Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 21 Jun 2024 16:38:17 -0400 Subject: [PATCH 3/8] add setuptools for py3.12 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 90c282e..4a5beef 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,7 @@ "semantic_version~=2.10", "tqdm>=4.64.0", "requests>=2.31.0", + "setuptools", ] backend_plugins = [ From a36b25c949b5284663fc65dcfcefe496e693cf5b Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 21 Jun 2024 16:44:16 -0400 Subject: [PATCH 4/8] update changelog --- docs/releases/changelog-v0.1.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/releases/changelog-v0.1.md b/docs/releases/changelog-v0.1.md index fa27482..7770551 100644 --- a/docs/releases/changelog-v0.1.md +++ b/docs/releases/changelog-v0.1.md @@ -76,6 +76,9 @@ Specific upgrades for the latest release can be found [here](https://github.com/ so numpy version has been limited to less than 2.0. ([#40](https://github.com/SpeysideHEP/spey/pull/40)) +* Compatibility issues have been fixed in Python 3.12 + ([#39](https://github.com/SpeysideHEP/spey/pull/39)) + ## Contributors This release contains contributions from (in alphabetical order): From f9a8ea7efbe95bd08b38f19857a3300e824bbc6a Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 21 Jun 2024 16:44:25 -0400 Subject: [PATCH 5/8] update doc --- docs/known_issues.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/known_issues.rst b/docs/known_issues.rst index 588c573..2ddec87 100644 --- a/docs/known_issues.rst +++ b/docs/known_issues.rst @@ -3,6 +3,4 @@ Known Issues * It has been observed that the Scipy version and its compiler, which is used for maximising and profiling the likelihood can have a slight effect on the results. -* NumPy v2.0.0 does not work with autograd, which is used in "default_pdf.XXX" likelihoods. The dependencies are reformulated accordingly. - -* There are some dependency issues in some sub-versions of Python 3.12. This is due to deprecated system packages. Updates can be followed in PR `#39 `_. \ No newline at end of file +* NumPy v2.0.0 does not work with autograd, which is used in "default_pdf.XXX" likelihoods. The dependencies are reformulated accordingly. \ No newline at end of file From d04b8f91bed549614a52c29439acc0bac356751b Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 21 Jun 2024 16:44:38 -0400 Subject: [PATCH 6/8] bump version --- .zenodo.json | 6 +++--- src/spey/_version.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index d2eee48..fceb98b 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,8 +1,8 @@ { "description": "smooth inference for reinterpretation studies", "license": "MIT", - "title": "SpeysideHEP/spey: v0.1.9", - "version": "v0.1.9", + "title": "SpeysideHEP/spey: v0.1.10", + "version": "v0.1.10", "upload_type": "software", "creators": [ { @@ -31,7 +31,7 @@ }, { "scheme": "url", - "identifier": "https://github.com/SpeysideHEP/spey/tree/v0.1.9", + "identifier": "https://github.com/SpeysideHEP/spey/tree/v0.1.10", "relation": "isSupplementTo" }, { diff --git a/src/spey/_version.py b/src/spey/_version.py index 7980ca5..7c416db 100644 --- a/src/spey/_version.py +++ b/src/spey/_version.py @@ -1,3 +1,3 @@ """Version number (major.minor.patch[-label])""" -__version__ = "0.1.9" +__version__ = "0.1.10" From dcc29b854190c33897a0dad4399882d2ababd20a Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 21 Jun 2024 17:07:42 -0400 Subject: [PATCH 7/8] add control over prerelease --- src/spey/_version.py | 2 +- src/spey/system/webutils.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/spey/_version.py b/src/spey/_version.py index 7c416db..d0e837f 100644 --- a/src/spey/_version.py +++ b/src/spey/_version.py @@ -1,3 +1,3 @@ """Version number (major.minor.patch[-label])""" -__version__ = "0.1.10" +__version__ = "0.1.10-beta" diff --git a/src/spey/system/webutils.py b/src/spey/system/webutils.py index 51b77b2..c766aa6 100644 --- a/src/spey/system/webutils.py +++ b/src/spey/system/webutils.py @@ -105,7 +105,12 @@ def check_updates() -> None: version = __version__ if pypi_version: log.debug(f"Curernt version {version}, latest version {pypi_version}.") - if Version(version) < Version(pypi_version): + if "beta" in Version(version).prerelease: + log.warning( + f"A prerelease version of Spey is in use: {version}. " + f"Latest stable version is {pypi_version}." + ) + elif Version(version) < Version(pypi_version): log.warning( f"A newer version ({pypi_version}) of Spey is available. " f"Current version is {version}." From 81d8df3d4930dd18b4359a77493643447e138201 Mon Sep 17 00:00:00 2001 From: "Jack Y. Araz" Date: Fri, 21 Jun 2024 17:12:10 -0400 Subject: [PATCH 8/8] update documentation --- src/spey/base/model_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spey/base/model_config.py b/src/spey/base/model_config.py index e178abb..f8b261b 100644 --- a/src/spey/base/model_config.py +++ b/src/spey/base/model_config.py @@ -88,7 +88,7 @@ def fixed_poi_bounds( def rescale_poi_bounds( self, allow_negative_signal: bool = True, poi_upper_bound: Optional[float] = None ) -> List[Tuple[float, float]]: - """ + r""" Rescale bounds for POI. Args: