From de57930d6be7689a4d6cdfb45685a02fec09ccf6 Mon Sep 17 00:00:00 2001 From: Karl Nelson Date: Mon, 20 Jan 2025 18:42:05 -0800 Subject: [PATCH] =?UTF-8?q?Bump=20version:=201.5.2=20=E2=86=92=201.6.0.dev?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- doc/CHANGELOG.rst | 1 + jpype/__init__.py | 2 +- native/java/org/jpype/JPypeContext.java | 2 +- native/python/pyjp_module.cpp | 2 +- pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a6ab037ab..efd356d95 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.2 +current_version = 1.6.0.dev0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 581c3c887..3a38ed0ee 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -4,6 +4,7 @@ Changelog This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards. Latest Changes: +- **1.6.0.dev0 - 2025-01-20** - **1.5.2 - 2025-01-20** - Roll back agent change due to misbehaving JVM installs. diff --git a/jpype/__init__.py b/jpype/__init__.py index ef00c5d26..cf191d97d 100644 --- a/jpype/__init__.py +++ b/jpype/__init__.py @@ -52,7 +52,7 @@ __all__.extend(_jcustomizer.__all__) # type: ignore[name-defined] __all__.extend(_gui.__all__) # type: ignore[name-defined] -__version__ = "1.5.2" +__version__ = "1.6.0.dev0" __version_info__ = __version__.split('.') diff --git a/native/java/org/jpype/JPypeContext.java b/native/java/org/jpype/JPypeContext.java index 36b86f4c3..db2e06927 100644 --- a/native/java/org/jpype/JPypeContext.java +++ b/native/java/org/jpype/JPypeContext.java @@ -70,7 +70,7 @@ public class JPypeContext { - public final String VERSION = "1.5.2"; + public final String VERSION = "1.6.0.dev0"; private static final JPypeContext INSTANCE = new JPypeContext(); // This is the C++ portion of the context. diff --git a/native/python/pyjp_module.cpp b/native/python/pyjp_module.cpp index b9c4d9153..5107cf235 100644 --- a/native/python/pyjp_module.cpp +++ b/native/python/pyjp_module.cpp @@ -761,7 +761,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.2"); + PyModule_AddStringConstant(module, "__version__", "1.6.0.dev0"); // Our module will be used for PyFrame object and it is a requirement that // we have a builtins in our dictionary. diff --git a/pyproject.toml b/pyproject.toml index 449d9e873..d5ebbfcf6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" [project] name = "jpype1" -version = '1.5.2' +version = '1.6.0.dev0' authors = [ {name = "Steve Menard", email = "devilwolf@users.sourceforge.net"}, ]