arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/2.2' into 2.2

Browse Source 
# Conflicts:
#	requirements.txt
This commit is contained in:
grossmj 2017-11-27 14:21:02 +07:00
commit 09b1cac676
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-requirements.txt
View File

@ -1,7 +1,7 @@
-rrequirements.txt -rrequirements.txt
sphinx==1.6.2 sphinx==1.6.2
pytest==3.1.1 pytest==3.2.5
pep8==1.7.0 pep8==1.7.0
pytest-catchlog==1.2.2 pytest-catchlog==1.2.2
pytest-timeout==1.2.0 pytest-timeout==1.2.0

5
requirements.txt
View File

@ -6,6 +6,5 @@ Jinja2>=2.7.3
raven>=5.23.0 raven>=5.23.0
psutil>=3.0.0 psutil>=3.0.0
zipstream>=1.1.4 zipstream>=1.1.4
typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 typing>=3.5.3.0 # Otherwise yarl fail with python 3.4
multidict<3.2.0 # Otherwise fails when upgraded to v3.2.0 prompt-toolkit>=1.0.15
prompt-toolkit