diff --git a/MANIFEST.in b/MANIFEST.in index 2246ce2..b2ad3a2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,4 +3,3 @@ recursive-include mozci.egg-info * recursive-include test * include setup.py include README.rst -include requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 1f1b982..0000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -buildapi_client>=0.2.2 -ijson>=2.2 -keyring>=5.3,<=6.0 -progressbar>=2.3 -pushlog_client>=0.5.0 -requests>=2.8.1 -taskcluster>=0.3.0 -treeherder-client>=2.0.1 -jsonschema>=2.5.1 diff --git a/setup.py b/setup.py index cff8426..a0f141f 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,17 @@ from setuptools import setup, find_packages -with open('requirements.txt') as f: - required = f.read().splitlines() + +required = [ + "buildapi_client", + "ijson", + "keyring", + "progressbar", + "pushlog_client", + "requests", + "taskcluster", + "treeherder-client", + "jsonschema" +] setup( name='mozci', @@ -9,7 +19,6 @@ packages=find_packages(), install_requires=required + ['pytest-runner'], tests_require=required + ['mock', 'pytest'], - # Meta-data for upload to PyPI author='Armen Zambrano G.', author_email='armenzg@mozilla.com', diff --git a/tox.ini b/tox.ini index 49d9f17..46e5c1b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,9 @@ [tox] -envlist = py27 +envlist = py27_new_deps [testenv] -basepython = python - -deps = -rrequirements.txt +basepython = python2.7 +deps = coverage flake8 flake8_docstrings @@ -12,10 +11,35 @@ deps = -rrequirements.txt pytest pytest-capturelog +[testenv:py27_current_deps] +deps = + {[testenv]deps} + buildapi_client==0.2.2 + ijson==2.2 + keyring==5.3 + progressbar==2.3 + pushlog_client==0.5.0 + requests==2.8.1 + taskcluster==0.3.0 + treeherder-client==2.0.1 + jsonschema==2.5.1 + + commands = flake8 mozci test coverage run --source=mozci -m py.test test + +[testenv:py27_new_deps] +deps = + {[testenv]deps} + + +commands = + flake8 mozci test + coverage run --source=mozci -m py.test test + + [flake8] exclude = .tox show-source = True