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

Fix riakcs dependencies #3033

Merged
merged 1 commit into from
Jan 28, 2019
Merged

Fix riakcs dependencies #3033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ env:
# if the c include path doesn't have the proper path pymqi will not compile
- C_INCLUDE_PATH="/opt/mqm/inc:$C_INCLUDE_PATH"
- LD_LIBRARY_PATH="/opt/mqm/lib64:/opt/mqm/lib:$LD_LIBRARY_PATH"
# https://github.com/travis-ci/travis-ci/issues/7940
- BOTO_CONFIG=/dev/null

stages:
- name: test_changed
Expand Down
3 changes: 1 addition & 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
@@ -1,8 +1,7 @@
adodbapi==2.6.0.7; sys_platform == 'win32'
asn1crypto==0.24.0
beautifulsoup4==4.5.1
boto==2.46.1; python_version < '3.0'
boto3==1.9.67; python_version > '3.0'
boto==2.46.1
cffi==1.11.5
cryptography==2.3.1
cx_oracle==6.0.1
Expand Down
4 changes: 1 addition & 3 deletions riakcs/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
boto==2.46.1; python_version < '3.0'
# boto3==1.9.67; python_version > '3.0'
google-compute-engine==2.8.3
boto==2.46.1
59 changes: 0 additions & 59 deletions riakcs/requirements.txt
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions riakcs/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
minversion = 2.0
basepython = py27
envlist =
{py27,py36}-unit
py{27,36}-unit
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's keep it as py27,py36, I am applying the same logic on all tox files in another PR and I choose the former wat just because there are less of the later

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe could we change the other pr? I think this is more standard in other projects it seems

Copy link
Contributor

Choose a reason for hiding this comment

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

sure

flake8

[testenv]
usedevelop = true
platform = linux|darwin|win32
passenv = BOTO_CONFIG
deps =
-e../datadog_checks_base[deps]
-rrequirements.in
-rrequirements-dev.txt
commands =
pip install --require-hashes -r requirements.txt
pip install -r requirements.in
pytest -v

[testenv:flake8]
Expand All @@ -22,5 +22,5 @@ deps = flake8
commands = flake8 .

[flake8]
exclude = .eggs,.tox
exclude = .eggs,.tox,build
max-line-length = 120