Skip to content

Commit

Permalink
Merge pull request #1238 from marscher/cycle
Browse files Browse the repository at this point in the history
Bump version: 1.5.1 → 1.5.2.dev0
  • Loading branch information
marscher authored Nov 18, 2024
2 parents 7b1abed + e1c668e commit dfdeb76
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
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.1
current_version = 1.5.2.dev0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
1 change: 1 addition & 0 deletions doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards.

Latest Changes:
- **1.5.2.dev0 - 2024-11-18**
- **1.5.1 - 2024-11-09**

- Future proofing for Python 3.14
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"
__version__ = "1.5.2.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.1";
public final String VERSION = "1.5.2.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 @@ -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");
PyModule_AddStringConstant(module, "__version__", "1.5.2.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 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.1'
version = '1.5.2.dev0'
authors = [
{name = "Steve Menard", email = "devilwolf@users.sourceforge.net"},
]
Expand Down

0 comments on commit dfdeb76

Please sign in to comment.