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

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle 2017-04-18 09:22:58 +02:00
commit 152807e654
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -2,7 +2,6 @@ jsonschema>=2.4.0
aiohttp>=1.3.5,<=1.4.0 # pyup: ignore aiohttp>=1.3.5,<=1.4.0 # pyup: ignore
aiohttp-cors==0.5.1 # pyup: ignore aiohttp-cors==0.5.1 # pyup: ignore
yarl>=0.9.8,<0.10 # pyup: ignore yarl>=0.9.8,<0.10 # pyup: ignore
typing>=3.5.3.0 # Otherwise yarl fail with python 3.4
Jinja2>=2.7.3 Jinja2>=2.7.3
raven>=5.23.0 raven>=5.23.0
psutil>=3.0.0 psutil>=3.0.0

3
setup.py
View File

@ -40,6 +40,9 @@ class PyTest(TestCommand):
dependencies = open("requirements.txt", "r").read().splitlines() dependencies = open("requirements.txt", "r").read().splitlines()
if sys.version_info <= (3, 4):
dependencies.append('typing>=3.5.3.0 # Otherwise yarl fail with python 3.4')
setup( setup(
name="gns3-server", name="gns3-server",
version=__import__("gns3server").__version__, version=__import__("gns3server").__version__,