From ab319b24874732040d97949d15efe727286befc0 Mon Sep 17 00:00:00 2001 From: Zhiyi Wu Date: Sat, 24 Aug 2024 09:52:43 +0100 Subject: [PATCH 1/4] update --- .github/workflows/ci.yaml | 2 +- CHANGES | 19 ++++++++++++------- setup.py | 3 +-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af9f2c9a..48afafdd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macOS-latest", "windows-latest"] - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12"] # Only test lowest and highest version on the expensive/slow # macOS and windows runners (UPDATE when supported versions change): exclude: diff --git a/CHANGES b/CHANGES index cdd66d53..3f19812a 100644 --- a/CHANGES +++ b/CHANGES @@ -14,14 +14,19 @@ The rules for this file: ------------------------------------------------------------------------------ -**/**/**** xiki-tempula +08/24/2024 xiki-tempula + * 2.3.2 -08/07/2024 orbeckst, xiki-tempula +Changes: + - Remove Python 3.9 support (issue #341, PR #304). Enhancements - Add a tutorial section in the documentation (issue #382, PR #379). + +07/08/2024 orbeckst, xiki-tempula + * 2.3.1 Changes: @@ -32,7 +37,7 @@ Fixes - Support matplotlib 3.9.0 (issue alchemistry/flamel#28, PR#319). -21/05/2024 xiki-tempula +05/21/2024 xiki-tempula * 2.3.0 @@ -47,7 +52,7 @@ Enhancements - `BAR` result is used as initial guess for `MBAR` estimator. (PR #357) - `forward_backward_convergence` uses the result from the previous step as the initial guess for the next step. (PR #357) -06/04/2024 hl2500, xiki-tempula +04/06/2024 hl2500, xiki-tempula * 2.2.0 @@ -69,7 +74,7 @@ Fixes unit conversion (issue #350, PR#319). -22/06/2023 xiki-tempula +06/22/2023 xiki-tempula * 2.1.0 @@ -95,7 +100,7 @@ DeprecationWarning analytic to bootstrap=50 in 2.2.0 (issue #320, PR#322). -06/04/2023 xiki-tempula +04/06/2023 xiki-tempula * 2.0.1 @@ -127,7 +132,7 @@ Removals equivalent functionality. (issue #284) -12/09/2022 DrDomenicoMarson, xiki-tempula, orbeckst +09/12/2022 DrDomenicoMarson, xiki-tempula, orbeckst * 1.0.1 diff --git a/setup.py b/setup.py index 1d9c7ca5..375e76c7 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,6 @@ "Operating System :: Microsoft :: Windows ", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", @@ -43,7 +42,7 @@ license="BSD", long_description=open("README.md").read(), long_description_content_type="text/markdown", - python_requires=">=3.9", + python_requires=">=3.10", tests_require=["pytest", "alchemtest"], install_requires=[ "numpy", From 81b0d669e59bccca92ab70a400485e65a033da8e Mon Sep 17 00:00:00 2001 From: Zhiyi Wu Date: Sat, 24 Aug 2024 10:07:34 +0100 Subject: [PATCH 2/4] fix readme --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 375e76c7..2ede5b2d 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,12 @@ packages=find_packages("src"), package_dir={"": "src"}, license="BSD", - long_description=open("README.md").read(), + long_description=open("README.md") + .read() + .replace( + "[![Zenodo DOI](https://zenodo.org/badge/68669096.svg)](https://zenodo.org/badge/latestdoi/68669096) [![Documentation](https://readthedocs.org/projects/alchemlyb/badge/?version=latest)](http://alchemlyb.readthedocs.io/en/latest/) [![Build Status](https://github.com/alchemistry/alchemlyb/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/alchemistry/alchemlyb/actions/workflows/ci.yaml) [![Code coverage](https://codecov.io/gh/alchemistry/alchemlyb/branch/master/graph/badge.svg)](https://codecov.io/gh/alchemistry/alchemlyb) [![anaconda package](https://anaconda.org/conda-forge/alchemlyb/badges/version.svg)](https://anaconda.org/conda-forge/alchemlyb)", + "\n", + ), long_description_content_type="text/markdown", python_requires=">=3.10", tests_require=["pytest", "alchemtest"], From 440de02f1f204754444eb40b0817f1a88831e8fb Mon Sep 17 00:00:00 2001 From: Zhiyi Wu Date: Sat, 24 Aug 2024 10:10:02 +0100 Subject: [PATCH 3/4] fix issue --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3f19812a..521cd3d2 100644 --- a/CHANGES +++ b/CHANGES @@ -19,7 +19,7 @@ The rules for this file: * 2.3.2 Changes: - - Remove Python 3.9 support (issue #341, PR #304). + - Remove Python 3.9 support (issue #389, PR #390). Enhancements - Add a tutorial section in the documentation (issue #382, PR #379). From 0b9de02aaa9f6203daf872d3bdf3e32be981f88d Mon Sep 17 00:00:00 2001 From: Zhiyi Wu Date: Sun, 25 Aug 2024 10:42:59 +0100 Subject: [PATCH 4/4] Add comments --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 2ede5b2d..fa612485 100755 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ packages=find_packages("src"), package_dir={"": "src"}, license="BSD", + # Remove the badges as pypi didn't like them. https://github.com/alchemistry/alchemlyb/pull/390 long_description=open("README.md") .read() .replace(