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.

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

Jump to bottom

Bump jaydebeapi and jpype1 #6963

Merged
merged 20 commits into from
Aug 25, 2020
Merged

Bump jaydebeapi and jpype1 #6963

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
302d1d9
Bump jaydebeapi and jpype1
hithwen Jun 24, 2020
76c12bb
Remove transitive dependency
hithwen Jun 24, 2020
e2caec4
pin older jpype
hithwen Jun 24, 2020
9651596
Install gcc on e2e tests
hithwen Jun 24, 2020
7941b73
Install gcc on oracle environmnet
hithwen Jun 24, 2020
197e5f9
Style fix
hithwen Jun 25, 2020
c662daa
Accept apt-get installation
hithwen Jun 25, 2020
4fecca5
Add g++ to the mix
hithwen Jun 25, 2020
6ee3e54
Add gcc and g++ to -jdbc docker image
hithwen Jun 25, 2020
61695cf
Pin dependency only on py2
hithwen Jun 25, 2020
aca3b4e
pin jpype1 on py3 too
hithwen Jun 25, 2020
507c6ae
Merge remote-tracking branch 'origin/master' into julia/AI-863-bump-j…
hithwen Aug 20, 2020
0bd1a34
Merge remote-tracking branch 'origin/master' into julia/AI-863-bump-j…
hithwen Aug 20, 2020
c157ec3
Add new line at the end of the requirements file
hithwen Aug 20, 2020
d7f16fb
Move comment above
hithwen Aug 20, 2020
5d04f26
Merge remote-tracking branch 'origin/master' into julia/AI-863-bump-j…
hithwen Aug 20, 2020
2282d37
Merge remote-tracking branch 'origin/master' into julia/AI-863-bump-j…
hithwen Aug 20, 2020
918cab3
Merge remote-tracking branch 'origin/master' into julia/AI-863-bump-j…
hithwen Aug 20, 2020
7e8d779
Update agent_requirements.in
hithwen Aug 24, 2020
0a43212
Bump to jpype1=1.0.2 on py3
hithwen Aug 25, 2020
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
4 changes: 2 additions & 2 deletions datadog_checks_base/datadog_checks/base/data/agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'
httplib2==0.18.1
in-toto==0.4.2
ipaddress==1.0.22; python_version < '3.0'
jaydebeapi==1.1.1
jpype1==0.7.0
jaydebeapi==1.2.3
jpype1==0.7.1 ; python_version <= '2.7' # 0.7.5 it's not py2 compatible but this specific version breaks in py3
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on py3 jaydebeapi will bring latest jpype: https://github.com/baztian/jaydebeapi/blob/master/setup.py#L23

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we raise an issue on jaydebeapi repo about that ?

kafka-python==2.0.0
kazoo==2.6.1; sys_platform != 'win32'
kubernetes==8.0.1
Expand Down
4 changes: 2 additions & 2 deletions oracle/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cx-oracle==7.2.0
jaydebeapi==1.1.1
jpype1==0.7.0
jaydebeapi==1.2.3
jpype1==0.7.1 ; python_version <= '2.7' # 0.7.5 it's not py2 compatible but this specific version breaks in py3
6 changes: 5 additions & 1 deletion oracle/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'start_commands': [
'bash /tmp/install_instant_client.sh',
'apt-get install libaio1', # `apt-get update` already ran in install_instant_client.sh
'apt-get install gcc g++ -y',
],
'env_vars': {'LD_LIBRARY_PATH': '/opt/oracle/instantclient_19_3'},
}
Expand All @@ -34,7 +35,10 @@
# the integration will fallback to JDBC client
'use_jmx': True, # Using jmx to have a ready to use java runtime
'docker_volumes': ['{}/scripts/install_instant_client.sh:/tmp/install_instant_client.sh'.format(HERE)],
'start_commands': ['bash /tmp/install_instant_client.sh'],
'start_commands': [
'bash /tmp/install_instant_client.sh',
'apt-get install gcc g++ -y', # `apt-get update` already ran in install_instant_client.sh
],
}


Expand Down