Merge branch 'master' into py12

jpype-project · Dec 5, 2023 · b5c6083 · b5c6083
2 parents 2e15660 + c11c3a2
commit b5c6083
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.azure/build.yml b/.azure/build.yml
@@ -65,6 +65,9 @@ jobs:
       linux-3.11:
         imageName: "ubuntu-latest"
         python.version: '3.11'
+      linux-3.12:
+        imageName: "ubuntu-latest"
+        python.version: '3.12'
       windows-3.7:
         imageName: "windows-2019"
         python.version: '3.7'
@@ -81,6 +84,9 @@ jobs:
       windows-3.11:
         imageName: "windows-2019"
         python.version: '3.11'
+      windows-3.12:
+        imageName: "windows-2019"
+        python.version: '3.12'
       mac-3.9:
         imageName: "macos-11"
         python.version: '3.9'

diff --git a/.azure/scripts/test.yml b/.azure/scripts/test.yml
@@ -9,6 +9,7 @@ steps:
     version: 11
 
 - script: |
+    python -m pip install --upgrade pytest setuptools
     python setup.py build_ext --inplace
   displayName: 'Build module'