Merge pull request #874 from jpype-project/cycle

Cycle
jpype-project · Oct 23, 2020 · b6d3996 · b6d3996
2 parents c1fb653 + c513237
commit b6d3996
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.2_dev0
+current_version = 1.1.3_dev0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\_(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -4,7 +4,10 @@ Changelog
 This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards.
 
 Latest Changes:
-- **1.1.2_dev0 - 2020-10-21**
+- **1.1.3_dev0 - 2020-10-23**
+- **1.1.2 - 2020-10-23**
+
+  - Linux binaries are now stripped for size.
 
   - Add importlib.util to address instability in Python importlib boot process.
     Certain versions of Python such as 3.9 appear to not properly load this

diff --git a/jpype/__init__.py b/jpype/__init__.py
@@ -51,7 +51,7 @@
 __all__.extend(_jcustomizer.__all__)
 __all__.extend(_gui.__all__)
 
-__version__ = "1.1.2_dev0"
+__version__ = "1.1.3_dev0"
 __version_info__ = __version__.split('.')
 
 

diff --git a/native/java/org/jpype/JPypeContext.java b/native/java/org/jpype/JPypeContext.java
@@ -69,7 +69,7 @@
 public class JPypeContext
 {
 
-  public final String VERSION = "1.1.2_dev0";
+  public final String VERSION = "1.1.3_dev0";
 
   private static 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
@@ -712,7 +712,7 @@ PyMODINIT_FUNC PyInit__jpype()
 	// PyJPModule = module;
 	Py_INCREF(module);
 	PyJPModule = module;
-	PyModule_AddStringConstant(module, "__version__", "1.1.2_dev0");
+	PyModule_AddStringConstant(module, "__version__", "1.1.3_dev0");
 
 	// Initialize each of the python extension types
 	PyJPClass_initType(module);

diff --git a/setup.py b/setup.py
@@ -53,7 +53,7 @@
 
 setup(
     name='JPype1',
-    version='1.1.2_dev0',
+    version='1.1.3_dev0',
     description='A Python to Java bridge.',
     long_description=open('README.rst').read(),
     license='License :: OSI Approved :: Apache Software License',