diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | docs/.markment.yml | 2 | ||||
| -rw-r--r-- | docs/NEWS.md | 2 | ||||
| -rw-r--r-- | docs/contributing.md | 2 | ||||
| -rw-r--r-- | httpretty/__init__.py | 2 | ||||
| -rw-r--r-- | requirements.pip | 12 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | tox.ini | 16 |
11 files changed, 21 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index 7b85357..a4168b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - TEST_TYPE=functional install: - - pip install -r requirements.pip + - pip install -r requirements.txt script: - make $TEST_TYPE 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 @@ -1,7 +1,7 @@ -# HTTPretty 0.7.0 +# HTTPretty 0.7.1  - +[](http://tip4commit.com/projects/133) [](http://travis-ci.org/gabrielfalcao/HTTPretty) [](http://instanc.es) [ChangeLog](NEWS.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/.markment.yml b/docs/.markment.yml index f669aba..ab843b8 100644 --- a/docs/.markment.yml +++ b/docs/.markment.yml @@ -1,6 +1,6 @@ project: name: "HTTPretty" - version: 0.7.0 + version: 0.7.1 description: HTTP request mock tool for python tagline: Intercept real HTTP calls in python, test your software better. twitter: gabrielfalcao diff --git a/docs/NEWS.md b/docs/NEWS.md index d8fb0e1..79fa8c8 100644 --- a/docs/NEWS.md +++ b/docs/NEWS.md @@ -1,6 +1,6 @@ # Release Notes -## 0.7.0 (current) +## 0.7.1 (current) Improvements: 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/httpretty/__init__.py b/httpretty/__init__.py index 8b54ce2..8f60594 100644 --- a/httpretty/__init__.py +++ b/httpretty/__init__.py @@ -25,7 +25,7 @@ # OTHER DEALINGS IN THE SOFTWARE. from __future__ import unicode_literals -__version__ = version = '0.7.0' +__version__ = version = '0.7.1' from .core import httpretty, httprettified from .errors import HTTPrettyError 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 @@ -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("#") @@ -1,9 +1,13 @@ [tox] -envlist = py26, py27, py33 +envlist = py26, py27 [testenv] -deps = -r{toxinidir}/requirements.pip -commands = - {envpython} setup.py test - nosetests tests/unit - nosetests tests/functional +deps = -r{toxinidir}/requirements.txt +commands = nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/unit --cover-package=httpretty + +[testenv:functional] +commands = nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/functional --cover-package=httpretty + +[testenv:pep8] +deps = flake8 +commands = flake8 httpretty tests |