Merge pull request #24 from pyfarm/netifaces_retest

Migrate Back To Standard Netifaces Package
pyfarm · May 3, 2014 · 3c93ca6 · 3c93ca6
2 parents 8caca56 + 68b572d
commit 3c93ca6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.2
   - 3.3
+  - 3.4
 
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 from setuptools import setup
 
 install_requires = [
-    "psutil==1.2.1", "netifaces-merged", "netaddr",
+    "psutil==1.2.1", "netifaces", "netaddr",
     "colorama", "logutils"]