Skip to content

Commit

Permalink
Merge branch 'master' into pyup-update-pip-tools-1.9.0-to-1.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nicfit authored Jan 14, 2018
2 parents 05f2ff6 + 2985f89 commit 903191f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
aiodns==1.1.1
asn1crypto==0.23.0 # via cryptography
cffi==1.11.0 # via cryptography
cryptography==2.1.3 # via pyopenssl
cryptography==2.1.4 # via pyopenssl
deprecation==1.0.1 # via nicfit.py
idna==2.6 # via cryptography
lxml==4.1.1
nicfit.py==0.6.5
nicfit.py==0.6.6
pycares==2.3.0 # via aiodns
pycparser==2.18 # via cffi
pyopenssl==17.3.0
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PyYaml==3.12
Sphinx==1.6.5
check-manifest==0.35
check-manifest==0.36
flake8==3.5.0
git+https://github.com/nicfit/gitchangelog.git
ipdb==0.10.3
nicfit.py[cookiecutter]==0.6.3
nicfit.py[cookiecutter]==0.6.6
pip-tools==1.11.0
tox==2.9.1
twine==1.9.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/main.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PyOpenSSL==17.3.0
aiodns
lxml==4.1.1
nicfit.py==0.6.3
nicfit.py==0.6.6

0 comments on commit 903191f

Please sign in to comment.