Skip to content

Commit

Permalink
Split requirements.
Browse files Browse the repository at this point in the history
Problem:
 The requirements that are only needed for our build purposes were being
 installed with this package when they should not have been. This also
 caused an issue with attributions since we were pulling in our
 build requirements which do not need to attributed since they are not
 used during runtime.

Solution:
 Split requirements into build and runtime requirements files.
  • Loading branch information
ryan-talley committed Feb 21, 2018
1 parent 2e473ab commit c5611e1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
- PKG_VERSION=$(python -c "import f5_ctlr_agent; print f5_ctlr_agent.__version__")
install:
- pip install tox
- pip install -r ./agent-build-requirements.txt
- python ./setup.py install
script:
- tox -e style
Expand Down
4 changes: 1 addition & 3 deletions requirements.txt → agent-build-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
-e git+https://github.com/f5devcentral/f5-cccl.git@06254f6f3b399da8b7e830847d59add55c299f97#egg=f5-cccl
pyinotify==0.9.6
requests==2.9.1
pytest==3.0.2
mock
mock==2.0.0
flake8==3.4.1
pytest-cov==2.5.1
coveralls==1.1
Expand Down
3 changes: 3 additions & 0 deletions agent-runtime-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-e git+https://github.com/f5devcentral/f5-cccl.git@06254f6f3b399da8b7e830847d59add55c299f97#egg=f5-cccl
pyinotify==0.9.6
requests==2.9.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

install_reqs = []
install_links = []
install_gen = parse_reqs('./requirements.txt', session='setup')
install_gen = parse_reqs('./agent-runtime-requirements.txt', session='setup')

for req in install_gen:
install_reqs.append(str(req.req))
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ basepython =
coverage: python
passenv= COVERALLS_REPO_TOKEN
deps=
-rrequirements.txt
-ragent-build-requirements.txt
-ragent-runtime-requirements.txt
commands =
style: flake8 ./f5_ctlr_agent
style: pylint ./f5_ctlr_agent
Expand Down

0 comments on commit c5611e1

Please sign in to comment.