fix appveyor, re-introduce requirements.txt

.appveyor.yml

@@ -14,19 +14,17 @@ environment:
     secure: LPjrtFrWxYhOVGXzfPRV1GjtZE/wHoKq9m/PI6hSalfysUK5p2DxTG9uHlb4Q9qV
 install:
   - "pip install --user -U pip setuptools"
-  - "pip install --user --src .. -r requirements.txt"
+  - "pip install --user -r requirements.txt"
   - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
 test_script:
-  - "py.test -s --cov libmproxy --timeout 30"
+  - "py.test -s --cov libmproxy --cov netlib --cov libpathod --timeout 30 ./test/"
 cache:
   - C:\Users\appveyor\AppData\Local\pip\cache
 deploy_script:
   ps: |
     if($Env:APPVEYOR_REPO_BRANCH -match "master") {
-    git clone https://github.com/mitmproxy/release.git ..\release
-    pip install -e ..\release
-    python ..\release\rtool.py bdist
-    python ..\release\rtool.py upload-snapshot --bdist
+    python .\release\rtool.py bdist
+    python .\release\rtool.py upload-snapshot --bdist
     }
 notifications:
 - provider: Slack

.coveragerc

@@ -0,0 +1,11 @@
+[run]
+branch = True
+
+[report]
+show_missing = True
+include = *libmproxy* *netlib* *libpathod*
+exclude_lines =
+    pragma: nocover
+    pragma: no cover
+    raise NotImplementedError()
+omit = *contrib*, *tnetstring*, *platform*, *console*, *main.py

.travis.yml

@@ -22,8 +22,7 @@ matrix:
     - python: 3.5
       env: SCOPE="netlib"
     - python: 3.5
-      env: NO_ALPN=1
-      env: SCOPE="netlib"
+      env: NO_ALPN=1 SCOPE="netlib"
     - python: 2.7
       env: DOCS=1
       script: 'cd mitmproxy/docs && make html'
@@ -39,9 +38,7 @@ install:
       brew install python
     fi
   - "pip install -U pip setuptools"
-  - "pip install -e ./netlib[dev]"
-  - "pip install -e ./pathod[dev]"
-  - "pip install -e ./mitmproxy[dev,contentviews,examples]"
+  - "pip install -r requirements.txt"
 
 before_script:
   - "openssl version -a"

dev.bat

@@ -5,11 +5,7 @@ virtualenv %VENV% --always-copy
 if %errorlevel% neq 0 exit /b %errorlevel%
 call %VENV%\Scripts\activate.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
-pip install -e ./netlib[dev]
-if %errorlevel% neq 0 exit /b %errorlevel%
-pip install -e ./pathod[dev]
-if %errorlevel% neq 0 exit /b %errorlevel%
-pip install -e ./mitmproxy[dev,examples,contentviews]
+pip install -r requirements.txt
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.

dev.sh

@@ -4,9 +4,7 @@ VENV=./venv
 
 python -m virtualenv $VENV --always-copy
 . $VENV/bin/activate
-pip install -e ./netlib[dev]
-pip install -e ./pathod[dev]
-pip install -e ./mitmproxy[dev,examples,contentviews]
+pip install -r requirements.txt
 
 echo ""
 echo "* Created virtualenv environment in $VENV."

mitmproxy/setup.py

@@ -1,13 +1,16 @@
 from setuptools import setup, find_packages
 from codecs import open
 import os
-from libmproxy import version
+import sys
 
 # Based on https://github.com/pypa/sampleproject/blob/master/setup.py
 # and https://python-packaging-user-guide.readthedocs.org/
 
 here = os.path.abspath(os.path.dirname(__file__))
 
+sys.path.append(os.path.join(here, "..", "netlib"))
+from libmproxy import version
+
 with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = f.read()
 

pathod/setup.py

@@ -1,13 +1,16 @@
 from setuptools import setup, find_packages
 from codecs import open
 import os
-from libpathod import version
+import sys
 
 # Based on https://github.com/pypa/sampleproject/blob/master/setup.py
 # and https://python-packaging-user-guide.readthedocs.org/
 
 here = os.path.abspath(os.path.dirname(__file__))
 
+sys.path.append(os.path.join(here, "..", "netlib"))
+from libpathod import version
+
 with open(os.path.join(here, 'README.txt'), encoding='utf-8') as f:
     long_description = f.read()
 

requirements.txt

@@ -0,0 +1,4 @@
+-e ./netlib[dev]
+-e ./pathod[dev]
+-e ./mitmproxy[dev,examples,contentviews]
+-e ./release