merge metadata files

9 files changed, 0 insertions, 209 deletions

diff --git a/netlib/.appveyor.yml b/netlib/.appveyor.yml
deleted file mode 100644
index cd1354c2..00000000
--- a/netlib/.appveyor.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '{build}'
-shallow_clone: true
-environment:
-  matrix:
-    - PYTHON: "C:\\Python27"
-install:
-  - "%PYTHON%\\Scripts\\pip install --src . -r requirements.txt"
-  - "%PYTHON%\\python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
-build: off  # Not a C# project
-test_script:
-  - "%PYTHON%\\Scripts\\py.test -n 4 --timeout 10"
diff --git a/netlib/.env b/netlib/.env
deleted file mode 100644
index 69ac3f05..00000000
--- a/netlib/.env
+++ /dev/null
@@ -1,6 +0,0 @@
-DIR="$( dirname "${BASH_SOURCE[0]}" )"
-ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
-if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then
-    echo "Activating mitmproxy virtualenv..."
-    source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate"
-fi
diff --git a/netlib/.gitignore b/netlib/.gitignore
deleted file mode 100644
index d8ffb588..00000000
--- a/netlib/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-MANIFEST
-/build
-/dist
-/tmp
-/doc
-*.py[cdo]
-*.swp
-*.swo
-.coverage
-.idea/
-__pycache__
-_cffi__*
-.eggs/
-netlib.egg-info/
-pathod/
-.cache/
\ No newline at end of file
diff --git a/netlib/.landscape.yml b/netlib/.landscape.yml
deleted file mode 100644
index 9a3b615f..00000000
--- a/netlib/.landscape.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-max-line-length: 120
-pylint:
-  options:
-    dummy-variables-rgx: _$|.+_$|dummy_.+
-
-  disable:
-    - missing-docstring
-    - protected-access
-    - too-few-public-methods
-    - too-many-arguments
-    - too-many-instance-attributes
-    - too-many-locals
-    - too-many-public-methods
-    - too-many-return-statements
-    - too-many-statements
-    - unpacking-non-sequence
\ No newline at end of file
diff --git a/netlib/.travis.yml b/netlib/.travis.yml
deleted file mode 100644
index 651fdae8..00000000
--- a/netlib/.travis.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-sudo: false
-language: python
-
-matrix:
-  fast_finish: true
-  include:
-    - python: 2.7
-    - python: 2.7
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-    - python: 3.5
-    - python: 3.5
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-    - python: pypy
-    - python: pypy
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-
-install:
-  - |
-    if [[ $TRAVIS_OS_NAME == "osx" ]]
-    then
-      brew update || brew update # try again if it fails
-      brew outdated openssl || brew upgrade openssl
-      brew install python
-    fi
-  - |
-      if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
-        export PYENV_ROOT="$HOME/.pyenv"
-        if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
-          pushd "$PYENV_ROOT" && git pull && popd
-        else
-          rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
-        fi
-        export PYPY_VERSION="4.0.1"
-        "$PYENV_ROOT/bin/pyenv" install --skip-existing "pypy-$PYPY_VERSION"
-        virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
-        source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
-      fi
-  - "pip install -U pip setuptools"
-  - "pip install --src . -r requirements.txt"
-
-before_script:
-  - "openssl version -a"
-
-script:
-  - "py.test -s --cov netlib --timeout 10"
-
-after_success:
-  - coveralls
-
-notifications:
-  irc:
-    channels:
-      - "irc.oftc.net#mitmproxy"
-    on_success: change
-    on_failure: always
-  slack:
-    rooms:
-        - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu#ci
-    on_success: always
-    on_failure: always
-
-# exclude cryptography from cache
-# it depends on libssl-dev version
-# which needs to be compiled specifically to each version
-before_cache:
-  - pip uninstall -y cryptography
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages
-    - /home/travis/virtualenv/python2.7.9/bin
-    - /home/travis/virtualenv/pypy-2.5.0/site-packages
-    - /home/travis/virtualenv/pypy-2.5.0/bin
diff --git a/netlib/CONTRIBUTORS b/netlib/CONTRIBUTORS
deleted file mode 100644
index 3a4b9b46..00000000
--- a/netlib/CONTRIBUTORS
+++ /dev/null
@@ -1,22 +0,0 @@
-   253	Aldo Cortesi
-   230	Maximilian Hils
-   123	Thomas Kriechbaumer
-     8	Chandler Abraham
-     8	Kyle Morton
-     5	Sam Cleveland
-     3	Benjamin Lee
-     3	Sandor Nemes
-     2	Brad Peabody
-     2	Israel Nir
-     2	Matthias Urlichs
-     2	Pedro Worcel
-     2	Sean Coates
-     1	Andrey Plotnikov
-     1	Bradley Baetz
-     1	Felix Yan
-     1	M. Utku Altinkaya
-     1	Paul
-     1	Pritam Baral
-     1	Rouli
-     1	Tim Becker
-     1	kronick
diff --git a/netlib/LICENSE b/netlib/LICENSE
deleted file mode 100644
index c08a0186..00000000
--- a/netlib/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013, Aldo Cortesi. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/netlib/check_coding_style.sh b/netlib/check_coding_style.sh
deleted file mode 100755
index a1c94e03..00000000
--- a/netlib/check_coding_style.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-autopep8 -i -r -a -a .
-if [[ -n "$(git status -s)" ]]; then
-  echo "autopep8 yielded the following changes:"
-  git status -s
-  git --no-pager diff
-  exit 0 # don't be so strict about coding style errors
-fi
-
-autoflake -i -r --remove-all-unused-imports --remove-unused-variables .
-if [[ -n "$(git status -s)" ]]; then
-  echo "autoflake yielded the following changes:"
-  git status -s
-  git --no-pager diff
-  exit 0 # don't be so strict about coding style errors
-fi
-
-echo "Coding style seems to be ok."
-exit 0
diff --git a/netlib/requirements.txt b/netlib/requirements.txt
deleted file mode 100644
index aefbcb6d..00000000
--- a/netlib/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
--e .[dev]