From e2ca4ea923a73fb64eb252ce816fbbc4d6be3336 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Tue, 16 Feb 2016 22:01:50 +0100 Subject: fix minor things --- .coveragerc | 2 +- .landscape.yml | 2 +- README.rst | 4 ++-- release/mitmdump.spec | 2 +- release/mitmproxy.spec | 2 +- release/mitmweb.spec | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.coveragerc b/.coveragerc index 627a4110..b62409b6 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,6 @@ [run] branch = True -include = libmproxy netlib libpathod +include = mitmproxy netlib pathod omit = *contrib*, *tnetstring*, *platform*, *console*, *main.py [report] diff --git a/.landscape.yml b/.landscape.yml index 2f7b85e1..1cf78412 100644 --- a/.landscape.yml +++ b/.landscape.yml @@ -1,7 +1,7 @@ ignore-paths: - mitmproxy/docs - mitmproxy/examples - - mitmproxy/libmproxy/contrib + - mitmproxy/mitmproxy/contrib - mitmproxy/web max-line-length: 140 pylint: diff --git a/README.rst b/README.rst index 9e89bf60..784c87ab 100644 --- a/README.rst +++ b/README.rst @@ -53,7 +53,7 @@ mitmproxy test suite: .. code-block:: text . venv/bin/activate # venv\Scripts\activate.bat on Windows - py.test --cov-config .coveragerc test + py.test test Note that the main executables for the project - ``mitmdump``, ``mitmproxy``, ``mitmweb``, ``pathod``, and ``pathoc`` - are all created within the virtualenv. After activating the @@ -76,7 +76,7 @@ requirements installed, and you can simply run the test suite: .. code-block:: text - py.test --cov-config .coveragerc test + py.test test Please ensure that all patches are accompanied by matching changes in the test suite. The project tries to maintain 100% test coverage. diff --git a/release/mitmdump.spec b/release/mitmdump.spec index a7bca16a..967f5e58 100644 --- a/release/mitmdump.spec +++ b/release/mitmdump.spec @@ -4,7 +4,7 @@ from PyInstaller.utils.hooks import collect_data_files a = Analysis(['../mitmproxy/mitmdump'], binaries=None, - datas=collect_data_files("libmproxy.onboarding"), + datas=collect_data_files("mitmproxy.onboarding"), hiddenimports=[], hookspath=None, runtime_hooks=None, diff --git a/release/mitmproxy.spec b/release/mitmproxy.spec index 7cafadbf..6356b0a6 100644 --- a/release/mitmproxy.spec +++ b/release/mitmproxy.spec @@ -4,7 +4,7 @@ from PyInstaller.utils.hooks import collect_data_files a = Analysis(['../mitmproxy/mitmproxy'], binaries=None, - datas=collect_data_files("libmproxy.onboarding"), + datas=collect_data_files("mitmproxy.onboarding"), hiddenimports=[], hookspath=None, runtime_hooks=None, diff --git a/release/mitmweb.spec b/release/mitmweb.spec index cba9b5cd..e3e634fa 100644 --- a/release/mitmweb.spec +++ b/release/mitmweb.spec @@ -4,7 +4,7 @@ from PyInstaller.utils.hooks import collect_data_files a = Analysis(['../mitmproxy/mitmweb'], binaries=None, - datas=collect_data_files("libmproxy"), + datas=collect_data_files("mitmproxy"), hiddenimports=[], hookspath=None, runtime_hooks=None, -- cgit v1.2.3