From 756687280284d44545f07ba0ecaf1bb618a53eae Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Sun, 10 Dec 2023 16:21:45 -0800 Subject: [PATCH 1/7] =?UTF-8?q?Bump=20version:=201.5.0=5Fdev0=20=E2=86=92?= =?UTF-8?q?=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- doc/CHANGELOG.rst | 1 + jpype/__init__.py | 2 +- native/java/org/jpype/JPypeContext.java | 2 +- native/python/pyjp_module.cpp | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 83750a368..3d5870b0e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.0_dev0 +current_version = 1.5.0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\_(?P[a-z]+)(?P\d+))? diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index c4e08c0ab..52df3ca75 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -4,6 +4,7 @@ Changelog This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards. Latest Changes: +- **1.5.0 - 2023-12-10** - **1.5.0_dev0 - 2023-04-03** - Switched ``__eq__`` and ``__ne__`` operator to use ``equals`` rather than diff --git a/jpype/__init__.py b/jpype/__init__.py index aa7071ae9..7bf5c016a 100644 --- a/jpype/__init__.py +++ b/jpype/__init__.py @@ -52,7 +52,7 @@ __all__.extend(_jcustomizer.__all__) # type: ignore[name-defined] __all__.extend(_gui.__all__) # type: ignore[name-defined] -__version__ = "1.5.0_dev0" +__version__ = "1.5.0" __version_info__ = __version__.split('.') diff --git a/native/java/org/jpype/JPypeContext.java b/native/java/org/jpype/JPypeContext.java index 59396d1e9..8470c2bc4 100644 --- a/native/java/org/jpype/JPypeContext.java +++ b/native/java/org/jpype/JPypeContext.java @@ -73,7 +73,7 @@ public class JPypeContext { - public final String VERSION = "1.5.0_dev0"; + public final String VERSION = "1.5.0"; private static JPypeContext INSTANCE = new JPypeContext(); // This is the C++ portion of the context. diff --git a/native/python/pyjp_module.cpp b/native/python/pyjp_module.cpp index 9caa0d437..0bd9d86c3 100644 --- a/native/python/pyjp_module.cpp +++ b/native/python/pyjp_module.cpp @@ -729,7 +729,7 @@ PyMODINIT_FUNC PyInit__jpype() // PyJPModule = module; Py_INCREF(module); PyJPModule = module; - PyModule_AddStringConstant(module, "__version__", "1.5.0_dev0"); + PyModule_AddStringConstant(module, "__version__", "1.5.0"); // Our module will be used for PyFrame object and it is a requirement that // we have a builtins in our dictionary. diff --git a/setup.py b/setup.py index c48875b49..f35d8f937 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ setup( name='JPype1', - version='1.5.0_dev0', + version='1.5.0', description='A Python to Java bridge.', long_description=open('README.rst').read(), license='License :: OSI Approved :: Apache Software License', From 80485d8b6dcd0e1d3021b3b08b6a118317b88b1a Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Sun, 10 Dec 2023 17:14:06 -0800 Subject: [PATCH 2/7] Trying to fix build --- .azure/scripts/osx-python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/scripts/osx-python.sh b/.azure/scripts/osx-python.sh index 292ce31c2..743284bc1 100755 --- a/.azure/scripts/osx-python.sh +++ b/.azure/scripts/osx-python.sh @@ -35,7 +35,7 @@ curl $URL > $INSTALLER_NAME sudo installer -pkg $INSTALLER_NAME -target / -sudo rm /usr/local/bin/python +sudo rm -f /usr/local/bin/python sudo ln -s /usr/local/bin/python$PYTHON_VERSION /usr/local/bin/python which python From dad8cbec2e8ffd1e6b28b0e41e7600d21c428e33 Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Sun, 10 Dec 2023 17:25:17 -0800 Subject: [PATCH 3/7] Update dists --- .azure/release.yml | 5 +++++ .azure/scripts/osx-python.sh | 7 +++++-- doc/CHANGELOG.rst | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.azure/release.yml b/.azure/release.yml index 6c83ec4c9..2d3b4f014 100644 --- a/.azure/release.yml +++ b/.azure/release.yml @@ -71,6 +71,9 @@ stages: Python311: python.version: '3.11' python.architecture: 'x64' + Python312: + python.version: '3.12' + python.architecture: 'x64' pool: vmImage: "windows-2019" steps: @@ -101,6 +104,8 @@ stages: python.version: '3.10' Python311: python.version: '3.11' + Python312: + python.version: '3.12' pool: vmImage: "macos-11" steps: diff --git a/.azure/scripts/osx-python.sh b/.azure/scripts/osx-python.sh index 743284bc1..43f251559 100755 --- a/.azure/scripts/osx-python.sh +++ b/.azure/scripts/osx-python.sh @@ -16,13 +16,16 @@ case $PYTHON_VERSION in INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg ;; 3.10) - FULL_VERSION=3.10.4 + FULL_VERSION=3.10.11 INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg ;; 3.11) - FULL_VERSION=3.11.0 + FULL_VERSION=3.11.7 INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg ;; +3.12) + FULL_VERSION=3.12.0 + INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg esac URL=https://www.python.org/ftp/python/$FULL_VERSION/$INSTALLER_NAME diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 52df3ca75..ef9b51982 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -4,8 +4,9 @@ Changelog This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards. Latest Changes: -- **1.5.0 - 2023-12-10** -- **1.5.0_dev0 - 2023-04-03** +- **1.5.0 - 2023-04-03** + + - Support for Python 3.12 - Switched ``__eq__`` and ``__ne__`` operator to use ``equals`` rather than ``compareTo`` for comparable objects to avoid exception when comparing From ae01064fe982b027a8fa84a22eb7f743c3cafe15 Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Fri, 15 Dec 2023 12:23:54 -0800 Subject: [PATCH 4/7] Update the image --- .azure/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/release.yml b/.azure/release.yml index 2d3b4f014..276446d2c 100644 --- a/.azure/release.yml +++ b/.azure/release.yml @@ -37,12 +37,12 @@ stages: # python.architecture: aarch64 64Bit: arch: x86_64 - plat: manylinux2010_x86_64 + plat: manylinux2014_x86_64 image: quay.io/pypa/manylinux2010_x86_64 python.architecture: x64 32Bit: arch: i686 - plat: manylinux2010_i686 + plat: manylinux2014_i686 image: quay.io/pypa/manylinux2010_i686 python.architecture: x86 pool: From 27b607da779031d7f898146df0289a447b8f515d Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Fri, 15 Dec 2023 12:29:55 -0800 Subject: [PATCH 5/7] Update versions --- .azure/build.yml | 6 ------ .azure/release.yml | 5 ----- doc/release.rst | 5 +++++ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.azure/build.yml b/.azure/build.yml index a4a01b625..ae8f53c4e 100644 --- a/.azure/build.yml +++ b/.azure/build.yml @@ -50,9 +50,6 @@ jobs: dependsOn: Deps strategy: matrix: - linux-3.7: - imageName: "ubuntu-latest" - python.version: '3.7' linux-3.8: imageName: "ubuntu-latest" python.version: '3.8' @@ -68,9 +65,6 @@ jobs: linux-3.12: imageName: "ubuntu-latest" python.version: '3.12' - windows-3.7: - imageName: "windows-2019" - python.version: '3.7' windows-3.8: imageName: "windows-2019" python.version: '3.8' diff --git a/.azure/release.yml b/.azure/release.yml index 276446d2c..ebf1daeff 100644 --- a/.azure/release.yml +++ b/.azure/release.yml @@ -56,9 +56,6 @@ stages: condition: eq(1,1) strategy: matrix: - Python37: - python.version: '3.7' - python.architecture: 'x64' Python38: python.version: '3.8' python.architecture: 'x64' @@ -94,8 +91,6 @@ stages: python.architecture: 'x64' strategy: matrix: - Python37: - python.version: '3.7' Python38: python.version: '3.8' Python39: diff --git a/doc/release.rst b/doc/release.rst index 7d63ad300..be1400525 100644 --- a/doc/release.rst +++ b/doc/release.rst @@ -22,6 +22,11 @@ Full process: ``git checkout release`` - [ ] Make a new branch for the release cycle ``git checkout -b releases/{version}`` +- [ ] Check the .azure scripts to see if they are up to date. + Look on https://devguide.python.org/versions/ to see what versions can be dropped + Check Python versions for Windows + Check Python versions for OSX + Check the manylinux image for Linux - [ ] Merge the current master with the release ``git pull origin master`` - [ ] Start a release From edf15a7ee8b1839c593a6bea80d7bedd14d92830 Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Fri, 15 Dec 2023 12:32:44 -0800 Subject: [PATCH 6/7] Change image --- .azure/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/release.yml b/.azure/release.yml index ebf1daeff..b43d59fda 100644 --- a/.azure/release.yml +++ b/.azure/release.yml @@ -38,12 +38,12 @@ stages: 64Bit: arch: x86_64 plat: manylinux2014_x86_64 - image: quay.io/pypa/manylinux2010_x86_64 + image: quay.io/pypa/manylinux2014_x86_64 python.architecture: x64 32Bit: arch: i686 plat: manylinux2014_i686 - image: quay.io/pypa/manylinux2010_i686 + image: quay.io/pypa/manylinux2014_i686 python.architecture: x86 pool: vmImage: "ubuntu-latest" From 725a4268c32a69c412a449b0b2bba979893aeac0 Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Fri, 15 Dec 2023 13:12:04 -0800 Subject: [PATCH 7/7] =?UTF-8?q?Bump=20version:=201.5.0=20=E2=86=92=201.5.1?= =?UTF-8?q?=5Fdev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- doc/CHANGELOG.rst | 1 + jpype/__init__.py | 2 +- native/java/org/jpype/JPypeContext.java | 2 +- native/python/pyjp_module.cpp | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3d5870b0e..456d45728 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.0 +current_version = 1.5.1_dev0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\_(?P[a-z]+)(?P\d+))? diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index ef9b51982..e448dadb3 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -4,6 +4,7 @@ Changelog This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards. Latest Changes: +- **1.5.1_dev0 - 2023-12-15** - **1.5.0 - 2023-04-03** - Support for Python 3.12 diff --git a/jpype/__init__.py b/jpype/__init__.py index 7bf5c016a..c17f43065 100644 --- a/jpype/__init__.py +++ b/jpype/__init__.py @@ -52,7 +52,7 @@ __all__.extend(_jcustomizer.__all__) # type: ignore[name-defined] __all__.extend(_gui.__all__) # type: ignore[name-defined] -__version__ = "1.5.0" +__version__ = "1.5.1_dev0" __version_info__ = __version__.split('.') diff --git a/native/java/org/jpype/JPypeContext.java b/native/java/org/jpype/JPypeContext.java index 8470c2bc4..708e81b62 100644 --- a/native/java/org/jpype/JPypeContext.java +++ b/native/java/org/jpype/JPypeContext.java @@ -73,7 +73,7 @@ public class JPypeContext { - public final String VERSION = "1.5.0"; + public final String VERSION = "1.5.1_dev0"; private static JPypeContext INSTANCE = new JPypeContext(); // This is the C++ portion of the context. diff --git a/native/python/pyjp_module.cpp b/native/python/pyjp_module.cpp index 0bd9d86c3..a2110efea 100644 --- a/native/python/pyjp_module.cpp +++ b/native/python/pyjp_module.cpp @@ -729,7 +729,7 @@ PyMODINIT_FUNC PyInit__jpype() // PyJPModule = module; Py_INCREF(module); PyJPModule = module; - PyModule_AddStringConstant(module, "__version__", "1.5.0"); + PyModule_AddStringConstant(module, "__version__", "1.5.1_dev0"); // Our module will be used for PyFrame object and it is a requirement that // we have a builtins in our dictionary. diff --git a/setup.py b/setup.py index f35d8f937..7aa052c3c 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ setup( name='JPype1', - version='1.5.0', + version='1.5.1_dev0', description='A Python to Java bridge.', long_description=open('README.rst').read(), license='License :: OSI Approved :: Apache Software License',