Skip to content

Commit 26a6749

Browse files
jmao-denverjmao-denver
authored
Remove 3.6, 3.7, 3.8 from project's metadata and related dead code in the code base (#214)
* Remove 3.6,3.7,3.8 from proj's metadata * Remove dead code for 2.7, < 3.9 * Beat the GHA macos-13 brownout by moving to 14 * Try Java 11 * Separate macOS builds out * Add the macos job to the collect-artifact job * Refactor to add a Java version in the matrix
1 parent af718f8 commit 26a6749

14 files changed

Lines changed: 43 additions & 485 deletions

File tree

‎.github/env/Linux/requirements.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ setuptools
22
wheel
33
auditwheel>=6.4.2; python_version >= '3.14'
44
auditwheel>=6.1.0; python_version >= '3.13'
5-
auditwheel>=6.0.0; python_version >= '3.8'
6-
auditwheel>=5.4.0; python_version == '3.7'
7-
auditwheel>=5.3.0; python_version == '3.6'
5+
auditwheel>=6.0.0; python_version >= '3.9'
86
patchelf

‎.github/workflows/build.yml‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,28 @@ jobs:
5151
# opposed to manylinux_2_17 produced via the docker bake process). This is a compromise that seems reasonable
5252
# given the more experimental nature of the free-threaded builds, coupled with the fact that python 3.13t is
5353
# less likely to be used on older Linux distributions.
54-
- { machine: 'ubuntu-22.04', python: '3.13t', arch: 'amd64', cmd: '.github/env/Linux/bdist-wheel.sh' }
55-
- { machine: 'ubuntu-22.04-arm', python: '3.13t', arch: 'arm64', cmd: '.github/env/Linux/bdist-wheel.sh' }
56-
- { machine: 'ubuntu-22.04', python: '3.14t', arch: 'amd64', cmd: '.github/env/Linux/bdist-wheel.sh' }
57-
- { machine: 'ubuntu-22.04-arm', python: '3.14t', arch: 'arm64', cmd: '.github/env/Linux/bdist-wheel.sh' }
58-
59-
- { machine: 'windows-2022', python: '3.9', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
60-
- { machine: 'windows-2022', python: '3.10', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
61-
- { machine: 'windows-2022', python: '3.11', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
62-
- { machine: 'windows-2022', python: '3.12', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
63-
- { machine: 'windows-2022', python: '3.13', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
64-
- { machine: 'windows-2022', python: '3.13t', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
65-
- { machine: 'windows-2022', python: '3.14', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
66-
- { machine: 'windows-2022', python: '3.14t', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
67-
68-
- { machine: 'macos-13', python: '3.11', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
69-
- { machine: 'macos-13', python: '3.12', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
70-
- { machine: 'macos-13', python: '3.13', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
71-
- { machine: 'macos-13', python: '3.13t', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
72-
- { machine: 'macos-13', python: '3.14', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
73-
- { machine: 'macos-13', python: '3.14t', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
54+
- { machine: 'ubuntu-22.04', python: '3.13t', java: '8', cmd: '.github/env/Linux/bdist-wheel.sh' }
55+
- { machine: 'ubuntu-22.04-arm', python: '3.13t', java: '8', cmd: '.github/env/Linux/bdist-wheel.sh' }
56+
- { machine: 'ubuntu-22.04', python: '3.14t', java: '8',cmd: '.github/env/Linux/bdist-wheel.sh' }
57+
- { machine: 'ubuntu-22.04-arm', python: '3.14t', java: '8', cmd: '.github/env/Linux/bdist-wheel.sh' }
58+
59+
- { machine: 'windows-2022', python: '3.9', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
60+
- { machine: 'windows-2022', python: '3.10', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
61+
- { machine: 'windows-2022', python: '3.11', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
62+
- { machine: 'windows-2022', python: '3.12', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
63+
- { machine: 'windows-2022', python: '3.13', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
64+
- { machine: 'windows-2022', python: '3.13t', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
65+
- { machine: 'windows-2022', python: '3.14', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
66+
- { machine: 'windows-2022', python: '3.14t', java: '8', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
67+
68+
- { machine: 'macos-14', python: '3.11', java: '11', cmd: '.github/env/macOS/bdist-wheel.sh' }
69+
- { machine: 'macos-14', python: '3.12', java: '11', cmd: '.github/env/macOS/bdist-wheel.sh' }
70+
- { machine: 'macos-14', python: '3.13', java: '11', cmd: '.github/env/macOS/bdist-wheel.sh' }
71+
- { machine: 'macos-14', python: '3.13t', java: '11', cmd: '.github/env/macOS/bdist-wheel.sh' }
72+
- { machine: 'macos-14', python: '3.14', java: '11', cmd: '.github/env/macOS/bdist-wheel.sh' }
73+
- { machine: 'macos-14', python: '3.14t', java: '11', cmd: '.github/env/macOS/bdist-wheel.sh' }
74+
75+
7476
steps:
7577
- uses: actions/checkout@v5
7678

@@ -82,13 +84,13 @@ jobs:
8284
id: setup-java
8385
with:
8486
distribution: 'temurin'
85-
java-version: '8'
87+
java-version: ${{ matrix.info.java }}
8688

8789
- run: ${{ matrix.info.cmd }}
8890

8991
- uses: actions/upload-artifact@v4
9092
with:
91-
name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
93+
name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}
9294
path: dist/*.whl
9395
retention-days: 1
9496

@@ -112,8 +114,8 @@ jobs:
112114
fail-fast: false
113115
matrix:
114116
info:
115-
- { machine: 'macos-13', python: '3.9', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
116-
- { machine: 'macos-13', python: '3.10', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
117+
- { machine: 'macos-14', python: '3.9', cmd: '.github/env/macOS/bdist-wheel.sh' }
118+
- { machine: 'macos-14', python: '3.10', cmd: '.github/env/macOS/bdist-wheel.sh' }
117119

118120
steps:
119121
- uses: actions/checkout@v5
@@ -126,15 +128,15 @@ jobs:
126128
id: setup-java
127129
with:
128130
distribution: 'temurin'
129-
java-version: '8'
131+
java-version: '11'
130132

131133
- run: pip install --upgrade pip
132134
- run: pip install --upgrade setuptools
133135
- run: ${{ matrix.info.cmd }}
134136

135137
- uses: actions/upload-artifact@v4
136138
with:
137-
name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
139+
name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}
138140
path: dist/*.whl
139141
retention-days: 1
140142

‎RELEASE.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ The wheel artifacts are compatible with the table below, and released to the PyP
1717
| 3.12 | Linux | x86_64 |
1818
| 3.13 | Linux | x86_64 |
1919
| 3.13t | Linux | x86_64 |
20+
| 3.14 | Linux | x86_64 |
21+
| 3.14t | Linux | x86_64 |
2022
| 3.6 | Linux | arm64 |
2123
| 3.7 | Linux | arm64 |
2224
| 3.8 | Linux | arm64 |
@@ -26,6 +28,8 @@ The wheel artifacts are compatible with the table below, and released to the PyP
2628
| 3.12 | Linux | arm64 |
2729
| 3.13 | Linux | arm64 |
2830
| 3.13t | Linux | arm64 |
31+
| 3.14 | Linux | arm64 |
32+
| 3.14t | Linux | arm64 |
2933
| 3.6 | MacOS | x86_64 |
3034
| 3.7 | MacOS | x86_64 |
3135
| 3.8 | MacOS | x86_64 |
@@ -35,6 +39,8 @@ The wheel artifacts are compatible with the table below, and released to the PyP
3539
| 3.12 | MacOS | x86_64 |
3640
| 3.13 | MacOS | x86_64 |
3741
| 3.13t | MacOS | x86_64 |
42+
| 3.14 | MacOS | x86_64 |
43+
| 3.14t | MacOS | x86_64 |
3844
| 3.6 | MacOS | arm64 |
3945
| 3.7 | MacOS | arm64 |
4046
| 3.8 | MacOS | arm64 |
@@ -44,6 +50,8 @@ The wheel artifacts are compatible with the table below, and released to the PyP
4450
| 3.12 | MacOS | arm64 |
4551
| 3.13 | MacOS | arm64 |
4652
| 3.13t | MacOS | arm64 |
53+
| 3.14 | MacOS | arm64 |
54+
| 3.14t | MacOS | arm64 |
4755
| 3.6 | Windows | x86_64 |
4856
| 3.7 | Windows | x86_64 |
4957
| 3.8 | Windows | x86_64 |
@@ -53,6 +61,8 @@ The wheel artifacts are compatible with the table below, and released to the PyP
5361
| 3.12 | Windows | x86_64 |
5462
| 3.13 | Windows | x86_64 |
5563
| 3.13t | Windows | x86_64 |
64+
| 3.14 | Windows | x86_64 |
65+
| 3.14t | Windows | x86_64 |
5666

5767
## Process
5868

‎setup.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,17 +370,14 @@ def run(self):
370370
'install': JpyInstall,
371371
'install_lib': JpyInstallLib
372372
},
373-
python_requires='>=3.6',
373+
python_requires='>=3.9',
374374
classifiers=['Development Status :: 5 - Production/Stable',
375375
# Indicate who your project is intended for
376376
'Intended Audience :: Developers',
377377

378378
# Pick your license as you wish (should match "license" above)
379379
'License :: OSI Approved :: Apache Software License',
380380

381-
'Programming Language :: Python :: 3.6',
382-
'Programming Language :: Python :: 3.7',
383-
'Programming Language :: Python :: 3.8',
384381
'Programming Language :: Python :: 3.9',
385382
'Programming Language :: Python :: 3.10',
386383
'Programming Language :: Python :: 3.11',

0 commit comments

Comments
 (0)