Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Use pip-tools to pin dependencies #373

Merged
merged 3 commits into from
May 1, 2017
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
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ python:
- "3.5"
cache: pip
install:
- pip install -r requirements.txt
- pip install -r requirements_test.txt
- pip install -r requirements_dev.txt
- pip install coveralls
env:
- INTEGRATION_TARGET=
Expand Down
4 changes: 2 additions & 2 deletions docs/dev_tasks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ Running Tests
=============
As the parser is a complex beast, it has several hundred unit tests to help
catch regressions. To run those tests, make sure you have first added all of
the testing requirements:
the development requirements:

.. code-block:: bash

pip install -r requirements_test.txt
pip install -r requirements_dev.txt

Then, run py.test on all of the available unit tests:

Expand Down
9 changes: 4 additions & 5 deletions regparser/web/management/commands/async_eregs.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,13 @@ class Command(BaseCommand):
help = ( # noqa
"""
Asynchronous `eregs` commands. To run,
1. pip install -r requirements_web.txt
2. start redis. For example, with docker:
1. start redis. For example, with docker:
docker run -p 6379:6379 -d redis
3. start a worker process
2. start a worker process
python manage.py rqworker
4. run an asynchronous command
3. run an asynchronous command
python manage.py async_eregs pipeline 27 479 async_output_dir
5. check the status of your jobs:
4. check the status of your jobs:
python manage.py async_eregs # no parameters
"""
)
Expand Down
41 changes: 32 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
pip==8.1.2
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file requirements.txt setup.py
#
-e .
-e interpparser
git+https://github.com/python-constraint/[email protected]#egg=python-constraint
attrs==16.3.0
cached-property==1.3.0
click==6.6
coloredlogs==5.0
Django==1.9.10
decorator==4.0.11 # via ipython, networkx, traitlets
dj-database-url==0.4.1
django-click==1.2.0
django_rq==0.9.1
django-rq==0.9.1
django==1.11
djangorestframework==3.4
GitPython==2.0.2
gitdb==0.6.4 # via gitpython
gitpython==2.0.2
humanfriendly==2.4 # via coloredlogs
inflection==0.3.1
ipdb==0.10.0
ipython-genutils==0.2.0 # via traitlets
ipython==5.3.0 # via ipdb
jedi==0.10.2 # via ipython
json-delta==2.0
lxml==3.6.0
networkx==1.11
pbr==3.0.0 # via stevedore
pexpect==4.2.1 # via ipython
pickleshare==0.7.4 # via ipython
prompt-toolkit==1.0.14 # via ipython
ptyprocess==0.5.1 # via pexpect
pygments==2.2.0 # via ipython
pyparsing==2.1.4
git+https://github.com/python-constraint/python-constraint.git
requests==2.10.0
pytz==2017.2 # via django
redis==2.10.5 # via rq
requests-cache==0.4.12
requests==2.10.0
roman==2.0.0
setuptools==21.1.0
rq==0.7.1 # via django-rq
simplegeneric==0.8.1 # via ipython
six==1.10.0
smmap==0.9.0 # via gitdb
stevedore==1.13.0
-e .
-e interpparser
traitlets==4.3.2 # via ipython
wcwidth==0.1.7 # via prompt-toolkit
20 changes: 20 additions & 0 deletions requirements_dev.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-r requirements.txt

cov-core
coverage
flake8
flake8-blind-except
flake8-builtins
flake8-comprehensions
flake8-isort
flake8-pep3101
flake8-print
flake8-string-format
flake8-tuple
freezegun
httpretty
mock
pep8-naming
pytest
pytest-cov
pytest-django
75 changes: 75 additions & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file requirements_dev.txt requirements_dev.in
#
-e .
-e interpparser
git+https://github.com/python-constraint/[email protected]#egg=python-constraint
attrs==16.3.0
cached-property==1.3.0
click==6.6
coloredlogs==5.0
cov-core==1.15.0
coverage==4.1
decorator==4.0.11
dj-database-url==0.4.1
django-click==1.2.0
django-rq==0.9.1
django==1.11
djangorestframework==3.4
flake8-blind-except==0.1.1
flake8-builtins==0.2
flake8-comprehensions==1.2.1
flake8-isort==2.1.3
flake8-pep3101==1.0
flake8-polyfill==1.0.1 # via flake8-isort
flake8-print==2.0.2
flake8-string-format==0.2.3
flake8-tuple==0.2.12
flake8==3.2.1
freezegun==0.3.8
gitdb==0.6.4
gitpython==2.0.2
httpretty==0.8.14
humanfriendly==2.4
inflection==0.3.1
ipdb==0.10.0
ipython-genutils==0.2.0
ipython==5.3.0
isort==4.2.5 # via flake8-isort
jedi==0.10.2
json-delta==2.0
lxml==3.6.0
mccabe==0.5.3 # via flake8
mock==2.0.0
networkx==1.11
pbr==3.0.0
pep8-naming==0.4.1
pexpect==4.2.1
pickleshare==0.7.4
prompt-toolkit==1.0.14
ptyprocess==0.5.1
py==1.4.33 # via pytest
pycodestyle==2.2.0 # via flake8
pyflakes==1.3.0 # via flake8
pygments==2.2.0
pyparsing==2.1.4
pytest-cov==2.4.0
pytest-django==2.9.1
pytest==3.0.6
python-dateutil==2.6.0 # via freezegun
pytz==2017.2
redis==2.10.5
requests-cache==0.4.12
requests==2.10.0
roman==2.0.0
rq==0.7.1
simplegeneric==0.8.1
six==1.10.0
smmap==0.9.0
stevedore==1.13.0
testfixtures==4.13.5 # via flake8-isort
traitlets==4.3.2
wcwidth==0.1.7
18 changes: 0 additions & 18 deletions requirements_test.txt

This file was deleted.

2 changes: 0 additions & 2 deletions requirements_web.txt

This file was deleted.

6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"cached-property",
"click",
"coloredLogs",
"Django==1.9.*",
"django",
"dj-database-url",
"django-click",
"django_rq",
Expand All @@ -32,6 +32,10 @@
"six",
"stevedore"
],
dependency_links=[
"http://github.com/python-constraint/python-constraint/"
"archive/1.3.1.tar.gz#egg=python-constraint",
],
entry_points={
"console_scripts": "eregs=eregs:main",
"eregs_ns.parser.amendment.content": [
Expand Down