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

Fix merge issue

Browse Source
This commit is contained in:
Julien Duponchelle 2015-06-17 14:16:20 +02:00
parent b1f740c952
commit 0f15e4b56a
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@ -45,27 +45,12 @@ dependencies = [
"raven>=5.2.0" "raven>=5.2.0"
] ]
<< << << < HEAD
try: try:
import netifaces import netifaces
except ImportError: except ImportError:
# add gns3-netifaces only if netifaces isn't already installed # add gns3-netifaces only if netifaces isn't already installed
# for instance via a Debian package. # for instance via a Debian package.
dependencies.append("gns3-netifaces>=0.10.4.1") dependencies.append("gns3-netifaces>=0.10.4.1")
== == == =
dependencies = [
# "gns3-netifaces>=0.10.4.1",
"aiohttp>=0.14.4",
"jsonschema>=2.4.0",
"Jinja2>=2.7.3",
"raven>=5.2.0"]
# if not sys.platform.startswith("win"):
# dependencies.append("netifaces==0.10.4")
if sys.version_info == (3, 3):
dependencies.append("asyncio>=3.4.2")
>>>>>> > master
setup( setup(
name="gns3-server", name="gns3-server",