Skip to content

Change required for JPype 0.7.0 #102

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.

Sign up for GitHub

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

Closed
Thrameos wants to merge 4 commits into from
Closed

Change required for JPype 0.7.0 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef7ad4e
Merge pull request #35 from baztian/bugfix/ancient-date
baztian Mar 21, 2017
8850cf9
Fix development notes on how to publish a new release.
baztian Mar 21, 2017
e99a05d
Bump version: 1.1.0 → 1.1.1
baztian Mar 21, 2017
7225587
Change required for JPype 0.7.0
Thrameos Jun 27, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.1.0
current_version = 1.1.1
commit = True
tag = True

Expand Down
1 change: 1 addition & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Changelog
=========

- Next version - unreleased
- 1.1.1 - 2017-03-21

- Don't fail on dates before 1900 on Python < 3.

Expand Down
2 changes: 1 addition & 1 deletion README_development.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ Build a new release

9. Send new version and tags to github origin. ::

$ git push origin master --tags
$ git push origin master --follow-tags
7 changes: 5 additions & 2 deletions jaydebeapi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# License along with JayDeBeApi. If not, see
# <http://www.gnu.org/licenses/>.

__version_info__ = (1, 1, 0)
__version_info__ = (1, 1, 1)
__version__ = ".".join(str(i) for i in __version_info__)

import datetime
Expand Down Expand Up @@ -173,7 +173,10 @@ def _jdbc_connect_jpype(jclassname, url, driver_args, jars, libs):
# jvm_path = ('/usr/lib/jvm/java-6-openjdk'
# '/jre/lib/i386/client/libjvm.so')
jvm_path = jpype.getDefaultJVMPath()
jpype.startJVM(jvm_path, *args)
if jpype.__version__.startswith("0.6"):
jpype.startJVM(jvm_path, *args)
else:
jpype.startJVM(jvm_path, *args, ignoreUnrecognized=True, convertStrings=True)
if not jpype.isThreadAttachedToJVM():
jpype.attachThreadToJVM()
if _jdbc_name_to_const is None:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
setup(
#basic package data
name = 'JayDeBeApi',
version = '1.1.0',
version = '1.1.1',
author = 'Bastian Bowe',
author_email = 'bastian.dev@gmail.com',
license = 'GNU LGPL',
Expand Down