Merge pull request #93 from mithro/master

Clean up and update dependency specifications

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 27481cc..88e8857 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,13 @@
-docutils
-lxml
-pyjson
-pylint
-tox
+# Dependencies from setup.py's install_requires + setup_requires
+-e git+https://github.com/SymbiFlow/vtr-xml-utils.git#egg=vtr-xml-utils
+-e .
 
--e git://github.com/SymbiFlow/vtr-xml-utils#egg=vtr-xml-utils
+# Required for development
+check-manifest
+docutils
+flake8
+pylint
+pytest
+pytest-runner
+readme_renderer
+tox

setup.py

diff --git a/setup.py b/setup.py
index 55a9729..8b634a5 100644
--- a/setup.py
+++ b/setup.py
@@ -31,11 +31,7 @@
     install_requires=[
         'lxml',
         'pyjson',
-        'vtr_xml_utils @ git+https://github.com/Symbiflow/vtr-xml-utils'
-    ],
-    dependency_links=[
-        'https://github.com/Symbiflow/vtr-xml-utils/tarball/'
-        'master#egg=vtr-xml-utils-0.0.1'
+        'vtr-xml-utils',
     ],
     setup_requires=["pytest-runner"],
     tests_require=[

tox.ini

diff --git a/tox.ini b/tox.ini
index 2d1ac65..6f791c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,10 +11,7 @@
     py38: python3.8
     py39: python3.9
 deps =
-    check-manifest
-    readme_renderer
-    flake8
-    pytest
+    -r{toxinidir}/requirements.txt
 commands =
     check-manifest --ignore tox.ini,tests,*.pyc,*.swp
     python --version