Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cycle #1163

Merged
merged 7 commits into from
Dec 20, 2023
Merged

Cycle #1163

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .azure/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
18 changes: 9 additions & 9 deletions .azure/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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'
Expand All @@ -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:
Expand All @@ -91,8 +91,6 @@ stages:
python.architecture: 'x64'
strategy:
matrix:
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
Python39:
Expand All @@ -101,6 +99,8 @@ stages:
python.version: '3.10'
Python311:
python.version: '3.11'
Python312:
python.version: '3.12'
pool:
vmImage: "macos-11"
steps:
Expand Down
9 changes: 6 additions & 3 deletions .azure/scripts/osx-python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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+))?
Expand Down
5 changes: 4 additions & 1 deletion doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions doc/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jpype/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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('.')


Expand Down
2 changes: 1 addition & 1 deletion native/java/org/jpype/JPypeContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion native/python/pyjp_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading