Merge pull request #1163 from jpype-project/cycle

Cycle

.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'

.azure/release.yml

@@ -37,13 +37,13 @@ stages:
           #          python.architecture: aarch64
         64Bit:
           arch: x86_64
-          plat: manylinux2010_x86_64
-          image: quay.io/pypa/manylinux2010_x86_64
+          plat: manylinux2014_x86_64
+          image: quay.io/pypa/manylinux2014_x86_64
           python.architecture: x64
         32Bit:
           arch: i686
-          plat: manylinux2010_i686
-          image: quay.io/pypa/manylinux2010_i686
+          plat: manylinux2014_i686
+          image: quay.io/pypa/manylinux2014_i686
           python.architecture: x86
     pool:
       vmImage: "ubuntu-latest"
@@ -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'
@@ -71,6 +68,9 @@ stages:
         Python311:
           python.version: '3.11'
           python.architecture: 'x64'
+        Python312:
+          python.version: '3.12'
+          python.architecture: 'x64'
     pool:
       vmImage: "windows-2019"
     steps:
@@ -91,8 +91,6 @@ stages:
       python.architecture: 'x64'
     strategy:
       matrix:
-        Python37:
-          python.version: '3.7'
         Python38:
           python.version: '3.8'
         Python39:
@@ -101,6 +99,8 @@ stages:
           python.version: '3.10'
         Python311:
           python.version: '3.11'
+        Python312:
+          python.version: '3.12'
     pool:
       vmImage: "macos-11"
     steps:

.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
@@ -35,7 +38,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

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0_dev0
+current_version = 1.5.1_dev0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\_(?P<release>[a-z]+)(?P<build>\d+))?

doc/CHANGELOG.rst

@@ -4,7 +4,10 @@ Changelog
 This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards.
 
 Latest Changes:
-- **1.5.0_dev0 - 2023-04-03**
+- **1.5.1_dev0 - 2023-12-15**
+- **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

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

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.1_dev0"
 __version_info__ = __version__.split('.')
 
 

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.1_dev0";
 
   private static JPypeContext INSTANCE = new JPypeContext();
   // This is the C++ portion of the context.

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.1_dev0");
 
 	// Our module will be used for PyFrame object and it is a requirement that
 	// we have a builtins in our dictionary.

setup.py

@@ -49,7 +49,7 @@
 
 setup(
     name='JPype1',
-    version='1.5.0_dev0',
+    version='1.5.1_dev0',
     description='A Python to Java bridge.',
     long_description=open('README.rst').read(),
     license='License :: OSI Approved :: Apache Software License',