diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-16 03:59:52 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-16 03:59:52 +0100 |
| commit | 210e0c891e040d5dd21e361e6f17dbce3dbdde7f (patch) | |
| tree | 270e4b8a204861a6464b937b08d12e1a9f6da600 | |
| parent | 7049becdfe5fa16820fc7dd3da0866cf08464efd (diff) | |
| parent | 34f5f5a5c185517b6ddfdff14a17bc919e296d75 (diff) | |
| download | mitmproxy-210e0c891e040d5dd21e361e6f17dbce3dbdde7f.tar.gz mitmproxy-210e0c891e040d5dd21e361e6f17dbce3dbdde7f.tar.bz2 mitmproxy-210e0c891e040d5dd21e361e6f17dbce3dbdde7f.zip | |
Merge branch 'master' into refactor_read_http_body
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | libpathod/templates/index.html | 2 | ||||
| -rw-r--r-- | libpathod/version.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 10 |
5 files changed, 31 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..920563f5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: python +python: + - "2.7" +# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors +install: + - "pip install coveralls --use-mirrors" + - "pip install nose-cov --use-mirrors" + - "pip install -r requirements.txt --use-mirrors" + - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" +# command to run tests, e.g. python setup.py test +script: + - "nosetests --with-cov --cov-report term-missing" +after_success: + - coveralls
\ No newline at end of file @@ -1,3 +1,8 @@ +25 August 2013: pathod 0.9.2: + + * Adapt to interface changes in netlib + + 15 May 2013: pathod 0.9 (version synced with mitmproxy): * Pathod proxy mode. You can now configure clients to use pathod as an diff --git a/libpathod/templates/index.html b/libpathod/templates/index.html index 3bc4b9a1..5e4bd842 100644 --- a/libpathod/templates/index.html +++ b/libpathod/templates/index.html @@ -56,7 +56,7 @@ <h2>source</h2> <ul> - <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.1.tar.gz">pathod 0.9.1</a></li> + <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.2.tar.gz">pathod 0.9.2</a></li> <li>GitHub: <a href="http://github.com/mitmproxy/pathod">github.com/cortesi/pathod</a></li> </li> diff --git a/libpathod/version.py b/libpathod/version.py index af62b678..32dcf30d 100644 --- a/libpathod/version.py +++ b/libpathod/version.py @@ -1,4 +1,4 @@ -IVERSION = (0, 9, 1) +IVERSION = (0, 9, 2) VERSION = ".".join(str(i) for i in IVERSION) NAME = "pathod" NAMEVERSION = NAME + " " + VERSION diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..73ed126b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,10 @@ +Flask>=0.10.1 +Jinja2>=2.7.1 +MarkupSafe>=0.18 +Werkzeug>=0.9.4 +itsdangerous>=0.23 +nose>=1.3.0 +pyOpenSSL>=0.13.1 +pyasn1>=0.1.7 +requests>=2.1.0 +netlib>=0.9.2
\ No newline at end of file |