Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Rename all-requirements.txt to requirements.txt #1758

Merged
merged 1 commit into from
May 17, 2019
Merged
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 .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
install:
- virtualenv $HOME/oio && source $HOME/oio/bin/activate
- pip install --upgrade pip setuptools virtualenv tox
- pip install --upgrade -r all-requirements.txt -r test-requirements.txt
- pip install --upgrade -r requirements.txt -r test-requirements.txt
- pip install --upgrade zkpython
- go get gopkg.in/ini.v1 gopkg.in/tylerb/graceful.v1
- go get golang.org/x/sys/unix
Expand Down
2 changes: 1 addition & 1 deletion TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Then follow those steps to setup the automated test suite environment:

virtualenv venv-tests
source venv-tests/bin/activate
pip install -r all-requirements.txt
pip install -r requirements.txt
pip install -r test-requirements.txt
# Some tests run the "openio" CLI, so install it (from sources)
python setup.py install
Expand Down
14 changes: 0 additions & 14 deletions all-requirements.txt

This file was deleted.

1 change: 1 addition & 0 deletions all-requirements.txt
14 changes: 14 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
cliff>=2.0.0,!=2.1.0,<3.0.0
eventlet>=0.18.2,!=0.18.3,!=0.20.1,!=0.21.0,<1.0.0
gunicorn>=19.4.5,<20.0.0
lxml<5.0.0
plyvel>=0.9,<1.0.0
PyECLib>=1.2.0,<2.0.0
pyxattr>=0.4.0,<1.0.0
PyYAML>=3.10,<4.0
redis>=2.10.3,<4.0.0
requests!=2.13.0,<3.0.0
simplejson>=2.0.9,<4.0.0
urllib3>=1.13.1,<1.25.0
werkzeug>=0.9.1,<1.0.0
zkpython<1.0.0
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ setenv =
NOSE_ARGS = {env:NOSE_ARGS:} --with-flaky --with-timer --timer-ok=1 --timer-warning=10 --timer-top-n=10
VIRTUAL_ENV = {envdir}
deps =
-r{toxinidir}/all-requirements.txt
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = nosetests {posargs:tests/unit}
passenv = TRAVIS CIRCLECI OIO_* NOSE_ARGS
Expand Down