.azure/build.yml

@@ -1,5 +1,5 @@
 # JPype CI pipeline
-pr:
+trigger:
   branches:
     include:
     - master
@@ -22,67 +22,67 @@ variables:
 jobs:
 - job: Deps
   pool:
-    vmImage: "ubuntu-16.04"
+    vmImage: "ubuntu-latest"
   steps:
   - template: scripts/ivy.yml
 
 - job: Documentation
   pool:
-    vmImage: "ubuntu-16.04"
+    vmImage: "ubuntu-latest"
   steps:
   - template: scripts/documentation.yml
 
 - job: Coverage
   pool:
-    vmImage: "ubuntu-16.04"
+    vmImage: "ubuntu-latest"
   dependsOn: Deps
   steps:
   - template: scripts/deps.yml
   - template: scripts/coverage.yml
 
 - job: Tracing
   pool:
-    vmImage: "ubuntu-16.04"
+    vmImage: "ubuntu-latest"
   steps:
   - template: scripts/tracing.yml
 
 - job: Test
   dependsOn: Deps
   strategy:
     matrix:
-      linux-3.5:
-        imageName: "ubuntu-16.04"
-        python.version: '3.5'
-      linux-3.6:
-        imageName: "ubuntu-16.04"
-        python.version: '3.6'
       linux-3.7:
-        imageName: "ubuntu-16.04"
+        imageName: "ubuntu-latest"
         python.version: '3.7'
       linux-3.8:
-        imageName: "ubuntu-16.04"
+        imageName: "ubuntu-latest"
         python.version: '3.8'
       linux-3.9:
-        imageName: "ubuntu-16.04"
+        imageName: "ubuntu-latest"
         python.version: '3.9'
-      windows-3.5:
-        imageName: "vs2017-win2016"
-        python.version: '3.5'
-      windows-3.6:
-        imageName: "vs2017-win2016"
-        python.version: '3.6'
+      linux-3.10:
+        imageName: "ubuntu-latest"
+        python.version: '3.10'
+      linux-3.11:
+        imageName: "ubuntu-latest"
+        python.version: '3.11'
       windows-3.7:
-        imageName: "vs2017-win2016"
+        imageName: "windows-2019"
         python.version: '3.7'
       windows-3.8:
-        imageName: "vs2017-win2016"
+        imageName: "windows-2019"
         python.version: '3.8'
-        #windows-3.9:
-        #imageName: "vs2017-win2016"
-        #python.version: '3.9'
+      windows-3.9:
+        imageName: "windows-2019"
+        python.version: '3.9'
         #jpypetest.fast: 'true'
+      windows-3.10:
+        imageName: "windows-2019"
+        python.version: '3.10'
+      windows-3.11:
+        imageName: "windows-2019"
+        python.version: '3.11'
       mac-3.9:
-        imageName: "macos-10.14"
+        imageName: "macos-11"
         python.version: '3.9'
         jpypetest.fast: 'true'
 

.azure/release.yml

@@ -30,25 +30,20 @@ stages:
     strategy:
       matrix:
           # Disabled because it is fetching beta images
-          #        64Bit2010:
-          #          arch: x86_64
-          #          plat: manylinux2010_x86_64
-          #          image: quay.io/pypa/manylinux2010_x86_64
-          #          python.architecture: x64
           #        64Bit2014:
           #          arch: aarch64
           #          plat: manylinux2014_aarch64
           #          image: quay.io/pypa/manylinux2014_aarch64
           #          python.architecture: aarch64
         64Bit:
           arch: x86_64
-          plat: manylinux1_x86_64
-          image: quay.io/pypa/manylinux1_x86_64
+          plat: manylinux2010_x86_64
+          image: quay.io/pypa/manylinux2010_x86_64
           python.architecture: x64
         32Bit:
           arch: i686
-          plat: manylinux1_i686
-          image: quay.io/pypa/manylinux1_i686
+          plat: manylinux2010_i686
+          image: quay.io/pypa/manylinux2010_i686
           python.architecture: x86
     pool:
       vmImage: "ubuntu-latest"
@@ -61,9 +56,6 @@ stages:
     condition: eq(1,1)
     strategy:
       matrix:
-        Python36:
-          python.version: '3.6'
-          python.architecture: 'x64'
         Python37:
           python.version: '3.7'
           python.architecture: 'x64'
@@ -73,8 +65,14 @@ stages:
         Python39:
           python.version: '3.9'
           python.architecture: 'x64'
+        Python310:
+          python.version: '3.10'
+          python.architecture: 'x64'
+        Python311:
+          python.version: '3.11'
+          python.architecture: 'x64'
     pool:
-      vmImage: 'vs2017-win2016'
+      vmImage: "windows-2019"
     steps:
     - template: scripts/deps.yml
     - task: UsePythonVersion@0
@@ -93,16 +91,18 @@ stages:
       python.architecture: 'x64'
     strategy:
       matrix:
-        Python36:
-          python.version: '3.6'
         Python37:
           python.version: '3.7'
         Python38:
           python.version: '3.8'
         Python39:
           python.version: '3.9'
+        Python310:
+          python.version: '3.10'
+        Python311:
+          python.version: '3.11'
     pool:
-      vmImage: "macOS-10.14"
+      vmImage: "macos-11"
     steps:
     - template: scripts/deps.yml
     - script: .azure/scripts/osx-python.sh '$(python.version)'

.azure/scripts/build-wheels.sh

@@ -2,11 +2,10 @@
 set -e -x
 
 # Collect the pythons
-pys=(/opt/python/*/bin)
+pys=(/opt/python/cp*/bin)
 
-# Filter out Python 3.4
-pys=(${pys[@]//*34*/})
-pys=(${pys[@]//*27*/})
+# Exclude specific Pythons (3.6)
+pys=(${pys[@]//*36*/})
 
 # Compile wheels
 for PYBIN in "${pys[@]}"; do

.azure/scripts/osx-python.sh

@@ -3,21 +3,28 @@
 PYTHON_VERSION="$1"
 
 case $PYTHON_VERSION in
-3.6)
-  FULL_VERSION=3.6.8
-  ;;
 3.7)
   FULL_VERSION=3.7.9
+  INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
   ;;
 3.8)
-  FULL_VERSION=3.8.6
+  FULL_VERSION=3.8.10
+  INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
   ;;
 3.9)
-  FULL_VERSION=3.9.0
+  FULL_VERSION=3.9.12
+  INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
+  ;;
+3.10)
+  FULL_VERSION=3.10.4
+  INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg
+  ;;
+3.11)
+  FULL_VERSION=3.11.0
+  INSTALLER_NAME=python-$FULL_VERSION-macos11.pkg
   ;;
 esac
 
-INSTALLER_NAME=python-$FULL_VERSION-macosx10.9.pkg
 URL=https://www.python.org/ftp/python/$FULL_VERSION/$INSTALLER_NAME
 
 PY_PREFIX=/Library/Frameworks/Python.framework/Versions

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.4.1
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\_(?P<release>[a-z]+)(?P<build>\d+))?
@@ -28,4 +28,3 @@ values =
 search = Latest Changes:
 replace = Latest Changes:
 	- **{new_version} - {now:%Y-%m-%d}**
-

.readthedocs.yml

@@ -13,9 +13,16 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.8
+  version: "3.8"
   install:
     - method: pip
       path: .
       extra_requirements:
         - docs
+
+build:
+  image: latest
+  apt_packages:
+    - openjdk-8-jdk
+
+

README.rst

@@ -26,6 +26,8 @@ access to the entirety of CPython and Java libraries.
  <https://github.com/jpype-project/jpype>`_
 :Issue tracker: `GitHub Issues
  <https://github.com/jpype-project/jpype/issues>`_
+:Discussions: `GitHub Discussions
+ <https://github.com/jpype-project/jpype/discussions>`_
 :Documentation: `Python Docs`_
 :License: `Apache 2 License`_
 :Build status:  |TestsCI|_ |Docs|_

doc/CHANGELOG.rst

@@ -4,6 +4,53 @@ Changelog
 This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards.
 
 Latest Changes:
+- **1.4.1 - 2022-10-26**
+
+  - Fixed issue with startJVM changing locale settings.
+
+  - Changes to support Python 3.11
+
+  - Fix truncation of strings on null when using convert strings.
+
+  - Replaced distutil with packaging
+
+
+- **1.4.0 - 2022-05-14**
+
+  - Support for all different buffer type conversions.
+
+    - Improved buffer transfers to numpy as guaranteed to match Java types.
+      However, exact dtype for conversions is os/numpy version dependent.
+
+    - Support for byte order channels on buffer transfers.
+
+    - Byte size for buffers now fixed to Java definitions.
+
+    - When directly accessing Java arrays using memory view, Python requires a
+      cast from buffers.  Required because Python does not support memory view
+      alterations on non-native sizes.
+
+  - Fix crash when comparing JChar.
+
+     - Order handling for numerical operations with JChar fixed.
+
+  - Improved matching for Java functors based on parameter count.
+
+  - Dropped support for Python 3.5 and 3.6
+
+  - dbapi2 handles drivers that don't support autocommit.
+
+  - Fixed issue when Java classes with dunder methods such as  ``__del__`` 
+    caused conflicts in Python type system.   Java method which match dunder 
+    patterns are longer translated to Python.
+
+  - Fix issue with numpy arrays with no dimensions resulting in crash.
+
+  - Support for user defined conversions for java.lang.Class and array types.
+
+  - Fixed issue with ssize_t on Windows for Python 3.10.
+
+
 - **1.3.0 - 2021-05-19**
 
   - Fixes for memory issues found when upgrading to Python 3.10 beta.

doc/conf.py

@@ -31,7 +31,10 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.napoleon', 'sphinx.ext.autodoc', 'sphinx.ext.autosectionlabel', 'readthedocs_ext.readthedocs', ]
+extensions = ['sphinx.ext.napoleon',
+        'sphinx.ext.autodoc',
+       'sphinx.ext.autosectionlabel',
+       'readthedocs_ext.readthedocs', ]
 autosectionlabel_prefix_document = True
 
 # Add any paths that contain templates here, relative to this directory.
@@ -236,12 +239,7 @@ def patch(self, key):
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
-
-html_context = {
-    'css_files': [
-        '_static/theme_overrides.css',  # override wide tables in RTD theme
-    ],
-}
+html_css_files = ['theme_overrides.css']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

doc/dbapi2.rst

@@ -376,7 +376,41 @@ so that the custom return type accurately reflects the column type.
           # Custom return converter here
           return rc
    JSON = JSONType("JSON")
-  
+
+
+Interactions with prepared statements
+-------------------------------------
+
+Certain calls can be problematic for dbapi2 depending on driver.  In
+particular, SQL calls which invalidate the state of the connection will issue
+an exception when the connection is used.   In HSQLDB the statement
+``cur.execute('shutdown')`` invalidates the connection which when the statement
+is then automatically closed will then produce an exception.
+
+This exception is due to a conflict between dbapi2, Java, and HSQLDB
+specifications.  Dbapi2 requires that statements be executed as prepared
+statements, Java requires that closing a statement yields no action if the
+connection is already closed, and HSQLBD sets the ``isValid`` to false but not
+``isClosed``.  Thus executing a shutdown through dbapi2 would be expected to
+close the prepared statement on an invalid connection resulting in an error.
+
+We can address these sort of driver specific behaviors by applying a customizer
+to the Java class to add additional behaviors.
+
+.. code-block:: python
+
+        @jpype.JImplementationFor("java.sql.PreparedStatement")
+        class MyStatement(object):
+            @jpype.JOverride(sticky=True, rename='_close')
+            def close(self):
+                if not self.getConnection().isValid(100):
+                     return
+                return self._close()
+
+Alternatively we can access the ``java.sql.Connection`` directly and call the
+shutdown routine using an unprepared statement.  Though that would require
+accessing private fields.
+
 
 Conclusion
 ==========

doc/java/lang.py

@@ -25,7 +25,7 @@ class AutoCloseable:
 
     .. code-block:: python
 
-        from java.nio.files import Files, Paths
+        from java.nio.file import Files, Paths
         with Files.newInputStream(Paths.get("foo")) as fd:
           # operate on the input stream