From 21fd3182ba52f7e74cd5dca8dea853cf2cc1a65d Mon Sep 17 00:00:00 2001 From: Gabriel Falcao Date: Thu, 12 Dec 2013 12:25:15 -0500 Subject: [PATCH] removing requirements.pip, requirements now reside solely in requirements.txt --- MANIFEST.in | 2 +- README.md | 2 +- docs/contributing.md | 2 +- requirements.pip | 12 ------------ requirements.txt | 2 +- setup.py | 2 +- tox.ini | 9 --------- 7 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 requirements.pip delete mode 100644 tox.ini diff --git a/MANIFEST.in b/MANIFEST.in index 82391d9..1ccd819 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -include requirements.pip +include requirements.txt diff --git a/README.md b/README.md index 72dd0d6..eccddf3 100644 --- a/README.md +++ b/README.md @@ -424,7 +424,7 @@ mkvirtualenv --distribute --no-site-packages HTTPretty #### install the dependencies ```console -pip install -r requirements.pip +pip install -r requirements.txt ``` #### next steps: diff --git a/docs/contributing.md b/docs/contributing.md index e4ed3ae..efad32b 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -12,7 +12,7 @@ mkvirtualenv --distribute --no-site-packages HTTPretty ## installing the dependencies ```console -pip install -r requirements.pip +pip install -r requirements.txt ``` ## next steps diff --git a/requirements.pip b/requirements.pip deleted file mode 100644 index 5d38ec1..0000000 --- a/requirements.pip +++ /dev/null @@ -1,12 +0,0 @@ -argparse==1.2.1 -coverage==3.5.3 -httplib2==0.7.6 -misaka==1.0.2 -mock==1.0.1 -nose==1.2.1 -requests==1.1.0 -steadymark==0.4.5 -sure>=1.2.1 -tornado==2.4 -tox==1.4.2 -urllib3 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8690123..8247607 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,8 +22,8 @@ redis==2.7.1 requests==1.1.0 speakers==0.0.3 steadymark==0.4.5 -sure==1.2.1 tornado==2.4 tox==1.4.2 virtualenv==1.8.2 Werkzeug==0.9.1 +sure==1.2.2 diff --git a/setup.py b/setup.py index 2b8fca3..aeef1b0 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ HTTPRETTY_PATH = os.path.abspath(os.path.join(__file__, os.pardir)) def test_packages(): - test_reqs = os.path.join(HTTPRETTY_PATH, 'requirements.pip') + test_reqs = os.path.join(HTTPRETTY_PATH, 'requirements.txt') tests_require = [ line.strip() for line in open(test_reqs).readlines() if not line.startswith("#") diff --git a/tox.ini b/tox.ini deleted file mode 100644 index da5b979..0000000 --- a/tox.ini +++ /dev/null @@ -1,9 +0,0 @@ -[tox] -envlist = py26, py27, py33 - -[testenv] -deps = -r{toxinidir}/requirements.pip -commands = - {envpython} setup.py test - nosetests tests/unit - nosetests tests/functional