diff options
| -rw-r--r-- | .appveyor.yml | 30 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | MANIFEST.in | 5 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | docs/_templates/page.html (renamed from docs/_templates/layout.html) | 2 |
5 files changed, 21 insertions, 28 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 689ad5e5..64a5c882 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,11 +1,17 @@ version: '{build}' -shallow_clone: true build: off # Not a C# project environment: matrix: - PYTHON: "C:\\Python27" PATH: "%APPDATA%\\Python\\Scripts;C:\\Python27;C:\\Python27\\Scripts;%PATH%" - PYINSTALLER_VERSION: "git+https://github.com/pyinstaller/pyinstaller.git" + SNAPSHOT_HOST: + secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI= + SNAPSHOT_PORT: + secure: TiJPtg60/edYTH8RnoBErg== + SNAPSHOT_USER: + secure: 6yBwmO5gv4vAwoFYII8qjQ== + SNAPSHOT_PASS: + secure: LPjrtFrWxYhOVGXzfPRV1GjtZE/wHoKq9m/PI6hSalfysUK5p2DxTG9uHlb4Q9qV install: - "pip install --user -U pip setuptools" - "pip install --user --src .. -r requirements.txt" @@ -14,22 +20,14 @@ test_script: - "py.test -s --cov libmproxy --timeout 30" cache: - C:\Users\appveyor\AppData\Local\pip\cache -after_test: - - | +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 -p netlib -p mitmproxy bdist - - ps: Get-ChildItem ..\release\dist\*.zip | ForEach { Push-AppveyorArtifact $_.FullName -FileName $_.Name } -deploy: -- provider: FTP - host: 46.101.230.67:2222 - protocol: sftp - username: travis - password: - secure: +Ousom/XDCLx9+bUjr1mRKepgIzLdqP+clMpoAiPXUysZCDGxODD/7ij4z8GJ3AF - folder: snapshots - on: - branch: master + python ..\release\rtool.py bdist + python ..\release\rtool.py upload-snapshot --bdist + } notifications: - provider: Slack incoming_webhook: https://hooks.slack.com/services/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 diff --git a/.travis.yml b/.travis.yml index 8ea3ed32..3335a95a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,14 +70,10 @@ after_success: - | if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]] then - brew install curl --with-libssh2 git clone https://github.com/mitmproxy/release.git ../release pip install -e ../release - python ../release/rtool.py -p netlib -p mitmproxy bdist - for f in ../release/dist/* - do - $(brew --prefix curl)/bin/curl -u $SNAPSHOT_AUTH --hostpubmd5 $SNAPSHOT_PUBKEY --retry 5 -T $f sftp://$SNAPSHOT_HOST/ - done + python ../release/rtool.py bdist + python ../release/rtool.py upload-snapshot --sdist --bdist --wheel fi notifications: diff --git a/MANIFEST.in b/MANIFEST.in index eb921d43..bd612fd2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,7 @@ include mitmproxy mitmdump mitmweb include LICENSE CHANGELOG CONTRIBUTORS CONTRIBUTING.md README.rst graft examples +graft libmproxy graft test prune test/tools -prune docs -graft libmproxy -recursive-exclude * *.pyc *.pyo *.swo *.swp +recursive-exclude * *.pyc *.pyo *.swo *.swp *.map @@ -149,8 +149,8 @@ the documentation when a change is detected. :alt: Supported Python versions .. _Python: https://www.python.org/ -.. _virtualenv: https://virtualenv.pypa.io/en/latest/ -.. _here: https://virtualenv.pypa.io/en/latest/installation.html +.. _virtualenv: http://virtualenv.readthedocs.org/en/latest/ +.. _here: http://virtualenv.readthedocs.org/en/latest/installation.html .. _autoenv: https://github.com/kennethreitz/autoenv .. _.env: https://github.com/mitmproxy/mitmproxy/blob/master/.env .. _Sphinx: http://sphinx-doc.org/ diff --git a/docs/_templates/layout.html b/docs/_templates/page.html index b5738862..8002396a 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/page.html @@ -1,4 +1,4 @@ -{% extends "!layout.html" %} +{% extends "!page.html" %} {% block sidebartitle %} <a href="https://mitmproxy.org/" style="margin-bottom: 7px; background: none !important;"> <button class="btn btn-info"> |