diff options
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | .python-version | 2 | ||||
| -rw-r--r-- | .sources/bootswatch.less | 171 | ||||
| -rw-r--r-- | .sources/make | 5 | ||||
| -rw-r--r-- | .sources/variables.less | 208 | ||||
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | README.rst | 5 | ||||
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tox.ini | 8 |
11 files changed, 18 insertions, 411 deletions
diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 6b8710a7..00000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/.python-version b/.python-version deleted file mode 100644 index 2339c8bf..00000000 --- a/.python-version +++ /dev/null @@ -1,2 +0,0 @@ -2.7.11 -3.5.1 diff --git a/.sources/bootswatch.less b/.sources/bootswatch.less deleted file mode 100644 index f9e4b827..00000000 --- a/.sources/bootswatch.less +++ /dev/null @@ -1,171 +0,0 @@ -// Bootswatch.less -// Swatch: Journal -// Version: 2.0.4 -// ----------------------------------------------------- - -// TYPOGRAPHY -// ----------------------------------------------------- - -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700'); - -h1, h2, h3, h4, h5, h6, .navbar .brand { - font-weight: 700; -} - -// SCAFFOLDING -// ----------------------------------------------------- - -a { - text-decoration: none; -} - -.nav a, .navbar .brand, .subnav a, a.btn, .dropdown-menu a { - text-decoration: none; -} - -// NAVBAR -// ----------------------------------------------------- - -.navbar { - - .navbar-inner { - @shadow: 0 2px 4px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - .box-shadow(@shadow); - border-top: 1px solid #E5E5E5; - .border-radius(0); - } - - .brand { - text-shadow: none; - - &:hover { - background-color: #EEEEEE; - } - } - - .navbar-text { - line-height: 68px; - } - - .nav > li > a { - text-shadow: none; - } - - .dropdown-menu { - .border-radius(0); - } - - .nav li.dropdown.active > .dropdown-toggle, - .nav li.dropdown.active > .dropdown-toggle:hover, - .nav li.dropdown.open > .dropdown-toggle, - .nav li.dropdown.active.open > .dropdown-toggle, - .nav li.dropdown.active.open > .dropdown-toggle:hover { - background-color: @grayLighter; - color: @linkColor; - } - - .nav li.dropdown .dropdown-toggle .caret, - .nav .open .caret, - .nav .open .dropdown-toggle:hover .caret { - border-top-color: @black; - opacity: 1; - } - - .nav-collapse.in .nav li > a:hover { - background-color: @grayLighter; - } - - .nav-collapse .nav li > a { - color: @textColor; - text-decoration: none; - font-weight: normal; - } - - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - border-color: transparent; - } - - .navbar-search .search-query, - .navbar-search .search-query:hover { - border: 1px solid @grayLighter; - color: @textColor; - .placeholder(@gray); - } -} - -div.subnav { - background-color: @bodyBackground; - background-image: none; - @shadow: 0 1px 2px rgba(0,0,0,.25); - .box-shadow(@shadow); - .border-radius(0); - - &.subnav-fixed { - top: @navbarHeight; - } - - .nav > li > a:hover, - .nav > .active > a, - .nav > .active > a:hover { - color: @textColor; - text-decoration: none; - font-weight: normal; - } - - .nav > li:first-child > a, - .nav > li:first-child > a:hover { - .border-radius(0); - } -} - -// BUTTONS -// ----------------------------------------------------- - -.btn-primary { - .buttonBackground(lighten(@linkColor, 5%), @linkColor); -} - -[class^="icon-"], [class*=" icon-"] { - vertical-align: -2px; -} - -// MODALS -// ----------------------------------------------------- - -.modal { - .border-radius(0px); - background: @bodyBackground; -} - -.modal-header { - border-bottom: none; -} - -.modal-header .close { - text-decoration: none; -} - -.modal-footer { - background: transparent; - .box-shadow(none); - border-top: none; -} - - -// MISC -// ----------------------------------------------------- - -code, pre, pre.prettyprint, .well { - background-color: @grayLighter; -} - -.hero-unit { - .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); - border: 1px solid rgba(0,0,0,.05); - .border-radius(0); -} - -.table-bordered, .well, .prettyprint { - .border-radius(0); -} diff --git a/.sources/make b/.sources/make deleted file mode 100644 index 94648859..00000000 --- a/.sources/make +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -pygmentize -f html ../examples/test_context.py > ../pathod/templates/examples_context.html -pygmentize -f html ../examples/test_setup.py > ../pathod/templates/examples_setup.html -pygmentize -f html ../examples/test_setupall.py > ../pathod/templates/examples_setupall.html -pygmentize -f html ../examples/pathod_pathoc.py > ../pathod/templates/pathod_pathoc.html diff --git a/.sources/variables.less b/.sources/variables.less deleted file mode 100644 index 75ff5be6..00000000 --- a/.sources/variables.less +++ /dev/null @@ -1,208 +0,0 @@ -// Variables.less -// Variables to customize the look and feel of Bootstrap -// Swatch: Journal -// Version: 2.0.4 -// ----------------------------------------------------- - -// GLOBAL VALUES -// -------------------------------------------------- - - -// Grays -// ------------------------- -@black: #000; -@grayDarker: #222; -@grayDark: #333; -@gray: #888; -@grayLight: #999; -@grayLighter: #eee; -@white: #fff; - - -// Accent colors -// ------------------------- -@blue: #4380D3; -@blueDark: darken(@blue, 15%); -@green: #22B24C; -@red: #C00; -@yellow: #FCFADB; -@orange: #FF7F00; -@pink: #CC99CC; -@purple: #7a43b6; -@tan: #FFCA73; - - - -// Scaffolding -// ------------------------- -@bodyBackground: #FCFBFD; -@textColor: @grayDarker; - - -// Links -// ------------------------- -@linkColor: @blue; -@linkColorHover: @red; - - -// Typography -// ------------------------- -@sansFontFamily: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; -@serifFontFamily: Georgia, "Times New Roman", Times, serif; -@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; - -@baseFontSize: 14px; -@baseFontFamily: @sansFontFamily; -@baseLineHeight: 18px; -@altFontFamily: @serifFontFamily; - -@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold -@headingsColor: inherit; // empty to use BS default, @textColor - - -// Tables -// ------------------------- -@tableBackground: transparent; // overall background-color -@tableBackgroundAccent: @grayLighter; // for striping -@tableBackgroundHover: #f5f5f5; // for hover -@tableBorder: #ddd; // table and cell border - - -// Buttons -// ------------------------- -@btnBackground: @white; -@btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: darken(@white, 20%); - -@btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); - -@btnInfoBackground: #5bc0de; -@btnInfoBackgroundHighlight: #2f96b4; - -@btnSuccessBackground: #62c462; -@btnSuccessBackgroundHighlight: #51a351; - -@btnWarningBackground: lighten(@orange, 10%); -@btnWarningBackgroundHighlight: @orange; - -@btnDangerBackground: #ee5f5b; -@btnDangerBackgroundHighlight: #bd362f; - -@btnInverseBackground: @linkColor; -@btnInverseBackgroundHighlight: darken(@linkColor, 5%); - - -// Forms -// ------------------------- -@inputBackground: @white; -@inputBorder: #ccc; -@inputBorderRadius: 3px; -@inputDisabledBackground: @grayLighter; -@formActionsBackground: @grayLighter; - -// Dropdowns -// ------------------------- -@dropdownBackground: @bodyBackground; -@dropdownBorder: rgba(0,0,0,.2); -@dropdownLinkColor: @textColor; -@dropdownLinkColorHover: @textColor; -@dropdownLinkBackgroundHover: #eee; -@dropdownDividerTop: #e5e5e5; -@dropdownDividerBottom: @white; - - - -// COMPONENT VARIABLES -// -------------------------------------------------- - -// Z-index master list -// ------------------------- -// Used for a bird's eye view of components dependent on the z-axis -// Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1020; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; - - -// Sprite icons path -// ------------------------- -@iconSpritePath: "../img/glyphicons-halflings.png"; -@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; - - -// Input placeholder text color -// ------------------------- -@placeholderText: @grayLight; - - -// Hr border color -// ------------------------- -@hrBorder: @grayLighter; - - -// Navbar -// ------------------------- -@navbarHeight: 50px; -@navbarBackground: @bodyBackground; -@navbarBackgroundHighlight: @bodyBackground; - -@navbarText: @textColor; -@navbarLinkColor: @linkColor; -@navbarLinkColorHover: @linkColor; -@navbarLinkColorActive: @navbarLinkColorHover; -@navbarLinkBackgroundHover: @grayLighter; -@navbarLinkBackgroundActive: @grayLighter; - -@navbarSearchBackground: lighten(@navbarBackground, 25%); -@navbarSearchBackgroundFocus: @white; -@navbarSearchBorder: darken(@navbarSearchBackground, 30%); -@navbarSearchPlaceholderColor: #ccc; -@navbarBrandColor: @blue; - - -// Hero unit -// ------------------------- -@heroUnitBackground: @grayLighter; -@heroUnitHeadingColor: inherit; -@heroUnitLeadColor: inherit; - - -// Form states and alerts -// ------------------------- -@warningText: #c09853; -@warningBackground: #fcf8e3; -@warningBorder: darken(spin(@warningBackground, -10), 3%); - -@errorText: #b94a48; -@errorBackground: #f2dede; -@errorBorder: darken(spin(@errorBackground, -10), 3%); - -@successText: #468847; -@successBackground: #dff0d8; -@successBorder: darken(spin(@successBackground, -10), 5%); - -@infoText: #3a87ad; -@infoBackground: #d9edf7; -@infoBorder: darken(spin(@infoBackground, -10), 7%); - - - -// GRID -// -------------------------------------------------- - -// Default 940px grid -// ------------------------- -@gridColumns: 12; -@gridColumnWidth: 60px; -@gridGutterWidth: 20px; -@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); - -// Fluid grid -// ------------------------- -@fluidGridColumnWidth: 6.382978723%; -@fluidGridGutterWidth: 2.127659574%; diff --git a/.travis.yml b/.travis.yml index eda57384..65200ac1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,9 @@ matrix: include: - python: 3.5 env: TOXENV=lint - - language: generic - os: osx - osx_image: xcode7.1 - git: - depth: 9999999 - env: TOXENV=py27 + - os: osx + language: generic + env: TOXENV=py35 - python: 3.5 env: TOXENV=py35 - python: 3.5 @@ -45,7 +42,9 @@ install: then brew update || brew update # try again if it fails brew outdated openssl || brew upgrade openssl - brew install python + brew install python python3 + pip install -U pip setuptools wheel + pip3 install -U pip setuptools wheel fi - pip install tox @@ -55,9 +54,9 @@ after_success: - | if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]] then - pip install -U virtualenv - ./dev.sh - source venv/bin/activate + pip3 install -U virtualenv + ./dev.sh 3.5 + source venv3.5/bin/activate pip install -e ./release python ./release/rtool.py bdist python ./release/rtool.py upload-snapshot --bdist --wheel diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index a689ed5e..00000000 --- a/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM mitmproxy/base:latest-onbuild -EXPOSE 8080 -EXPOSE 8081 -VOLUME /certs @@ -52,9 +52,9 @@ If you want to contribute changes, keep on reading. Hacking ------- -To get started hacking on mitmproxy, make sure you have Python_ 2.7.x. with +To get started hacking on mitmproxy, make sure you have Python_ 3.5.x or above with virtualenv_ installed (you can find installation instructions for virtualenv -here_). Then do the following: +`here <http://virtualenv.readthedocs.org/en/latest/>`_). Then do the following: .. code-block:: text @@ -194,7 +194,6 @@ PR checks will fail and block merging. We are using this command to check for st .. _Python: https://www.python.org/ .. _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/requirements.txt b/requirements.txt index 092f834a..ce37652d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -https://maximilianhils.com/upload/2016-06/lxml-3.6.0-cp35-cp35m-win32.whl; sys_platform == 'win32' and python_version == '3.5' +https://maximilianhils.com/upload/2016-06/lxml-3.6.0-cp35-cp35m-win32.whl ; sys_platform == 'win32' and python_version == '3.5' -e .[dev,examples,contentviews] --e ./release
\ No newline at end of file +-e ./release @@ -32,6 +32,8 @@ setup( "Programming Language :: Python", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.5", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Security", @@ -7,16 +7,14 @@ deps = {env:CI_DEPS:} -rrequirements.txt passenv = CODECOV_TOKEN CI CI_* TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* -setenv = - TESTS = test/ - HOME = {envtmpdir} +setenv = HOME = {envtmpdir} commands = - py.test --timeout 60 {posargs} {env:TESTS} + py.test --timeout 60 {posargs} {env:CI_COMMANDS:python -c ""} [testenv:docs] changedir = docs -commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html +commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:lint] deps = flake8>=2.6.2, <3 |