Merge pull request #74 from cwacek/fix/69-versioning

Shift tests to use setup install_requires.
cwacek · Jul 23, 2017 · 71a6ad0 · 71a6ad0
2 parents 8cf05a7 + 922c36d
commit 71a6ad0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
 - '2.7'
 install:
-- pip install -r requirements.txt
 - pip install tox
 script: tox
 deploy:

diff --git a/setup.py b/setup.py
@@ -75,7 +75,12 @@ def parse_requirements(path):
           zip_safe=False,
           url='http://python-jsonschema-objects.readthedocs.org/',
           setup_requires=["setuptools>=18.0.0"],
-          install_requires=install_requires,
+          install_requires=[
+              "inflection~=0.2",
+              "Markdown==2.4",
+              "jsonschema~=2.3",
+              "six>=1.5.2"
+          ],
           dependency_links=dependency_links,
           cmdclass=versioneer.get_cmdclass(),
           classifiers=[

diff --git a/tox.ini b/tox.ini
@@ -7,7 +7,7 @@ envlist = py27, py35
 commands = coverage run {envbindir}/py.test {posargs}
            coverage html --omit=*test* --include=*python_jsonschema_objects*
 deps =
-  -rrequirements.txt
+  .
   coverage
   pytest