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

Releases/v1.5.1 #1232

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
22 changes: 16 additions & 6 deletions .azure/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,20 @@ stages:
# plat: manylinux2014_aarch64
# image: quay.io/pypa/manylinux2014_aarch64
# python.architecture: aarch64
arm64Bit:
arch: armv71
plat: musllinux_1_2
image: quay.io/pypa/musllinux_1_2_armv7l
python.architecture: armv71
64Bit:
arch: x86_64
plat: manylinux2014_x86_64
image: quay.io/pypa/manylinux2014_x86_64
plat: musllinux_1_2
image: quay.io/pypa/musllinux_1_2_x86_64
python.architecture: x64
32Bit:
arch: i686
plat: manylinux2014_i686
image: quay.io/pypa/manylinux2014_i686
plat: musllinux_1_2
image: quay.io/pypa/musllinux_1_2_i686
python.architecture: x86
pool:
vmImage: "ubuntu-latest"
Expand Down Expand Up @@ -71,8 +76,11 @@ stages:
Python312:
python.version: '3.12'
python.architecture: 'x64'
Python313:
python.version: '3.13'
python.architecture: 'x64'
pool:
vmImage: "windows-2019"
vmImage: "windows-2022"
steps:
- template: scripts/deps.yml
- task: UsePythonVersion@0
Expand Down Expand Up @@ -101,8 +109,10 @@ stages:
python.version: '3.11'
Python312:
python.version: '3.12'
Python313:
python.version: '3.13'
pool:
vmImage: "macos-11"
vmImage: "macos-13"
steps:
- template: scripts/deps.yml
- script: .azure/scripts/osx-python.sh '$(python.version)'
Expand Down
8 changes: 4 additions & 4 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[bumpversion]
current_version = 1.5.1_dev0
current_version = 1.5.1
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\_(?P<release>[a-z]+)(?P<build>\d+))?
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?
serialize =
{major}.{minor}.{patch}_{release}{build}
{major}.{minor}.{patch}.{release}{build}
{major}.{minor}.{patch}

[bumpversion:part:release]
Expand All @@ -16,7 +16,7 @@ values =

[bumpversion:part:build]

[bumpversion:file:setup.py]
[bumpversion:file:pyproject.toml]

[bumpversion:file:native/python/pyjp_module.cpp]

Expand Down
5 changes: 4 additions & 1 deletion doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ Changelog
This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards.

Latest Changes:
- **1.5.1 - 2024-11-09**

- **1.5.1_dev0 - 2023-12-15**
- Future proofing for Python 3.14

- Support for Python 3.13

- Allow access to default methods implemented in interfaces when using ``@JImplements``.

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.1_dev0"
__version__ = "1.5.1"
__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.1_dev0";
public final String VERSION = "1.5.1";

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 @@ -733,7 +733,7 @@ PyMODINIT_FUNC PyInit__jpype()
#ifdef Py_GIL_DISABLED
PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
#endif
PyModule_AddStringConstant(module, "__version__", "1.5.1_dev0");
PyModule_AddStringConstant(module, "__version__", "1.5.1");

// 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 pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "JPype1"
version = '1.5.0.dev0'
version = '1.5.1'
authors = [
{name = "Steve Menard", email = "[email protected]"},
]
Expand Down
Loading