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 #1255

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Cycle #1255

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
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.2.dev0
current_version = 1.6.0.dev0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
3 changes: 2 additions & 1 deletion doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ 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.6.0.dev0 - 2025-01-20**
- **1.5.2 - 2025-01-20**

- Roll back agent change due to misbehaving JVM installs.

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.2.dev0"
__version__ = "1.6.0.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 @@ -70,7 +70,7 @@
public class JPypeContext
{

public final String VERSION = "1.5.2.dev0";
public final String VERSION = "1.6.0.dev0";

private static final 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 @@ -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.dev0");
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.
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.2.dev0'
version = '1.6.0.dev0'
authors = [
{name = "Steve Menard", email = "devilwolf@users.sourceforge.net"},
]
Expand Down
Loading