merge metadata files

snemes · Feb 15, 2016 · 95cef3c · 95cef3c
1 parent dd2c500
commit 95cef3c
Show file tree

Hide file tree

Showing 39 changed files with 46 additions and 420 deletions.
diff --git a/mitmproxy/.appveyor.yml → .appveyor.yml b/mitmproxy/.appveyor.yml → .appveyor.yml
diff --git a/.env b/.env
@@ -0,0 +1,6 @@
+DIR="$( dirname "${BASH_SOURCE[0]}" )"
+ACTIVATE_DIR="$(if [ -f "$DIR/venv/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
+if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/venv/$ACTIVATE_DIR/activate" ]; then
+    echo "Activating mitmproxy virtualenv..."
+    source "$DIR/venv/$ACTIVATE_DIR/activate"
+fi
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+mitmproxy/libmproxy/web/static/**/* -diff
+mitmproxy/web/src/js/filt/filt.js -diff
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,19 @@
+.DS_Store
+MANIFEST
+*/build
+*/dist
+*/tmp
+/venv
+*.py[cdo]
+*.swp
+*.swo
+*.egg-info/
+.coverage
+.idea
+.cache/
+
+# UI
+
+node_modules
+bower_components
+*.map
diff --git a/mitmproxy/.landscape.yml → .landscape.yml b/mitmproxy/.landscape.yml → .landscape.yml
@@ -1,8 +1,8 @@
 ignore-paths:
-  - docs
-  - examples
-  - libmproxy/contrib
-  - web
+  - mitmproxy/docs
+  - mitmproxy/examples
+  - mitmproxy/libmproxy/contrib
+  - mitmproxy/web
 max-line-length: 140
 pylint:
   options:

diff --git a/mitmproxy/.travis.yml → .travis.yml b/mitmproxy/.travis.yml → .travis.yml
@@ -57,7 +57,9 @@ install:
         source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
       fi
   - "pip install -U pip setuptools"
-  - "pip install --src .. -r requirements.txt"
+  - "pip install -e ./netlib[dev]"
+  - "pip install -e ./pathod[dev]"
+  - "pip install -e ./mitmproxy[dev,contentviews,examples]"
 
 before_script:
   - "openssl version -a"

diff --git a/mitmproxy/CONTRIBUTING.md → CONTRIBUTING.md b/mitmproxy/CONTRIBUTING.md → CONTRIBUTING.md
diff --git a/mitmproxy/CONTRIBUTORS → CONTRIBUTORS b/mitmproxy/CONTRIBUTORS → CONTRIBUTORS
diff --git a/mitmproxy/LICENSE → LICENSE b/mitmproxy/LICENSE → LICENSE
diff --git a/mitmproxy/dev → dev b/mitmproxy/dev → dev
@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
-VENV=../venv.mitmproxy
+VENV=./venv
 
 python -m virtualenv $VENV --always-copy
 . $VENV/bin/activate
-pip install --src .. -r requirements.txt
+pip install -e ./netlib[dev]
+pip install -e ./pathod[dev]
+pip install -e ./mitmproxy[dev,examples,contentviews]
 
 echo ""
 echo "* Created virtualenv environment in $VENV."

diff --git a/mitmproxy/dev.bat → dev.bat b/mitmproxy/dev.bat → dev.bat
@@ -1,11 +1,15 @@
 @echo off
-set VENV=..\venv.mitmproxy
+set VENV=.\venv
 
 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 --src .. -r requirements.txt
+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]
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.

diff --git a/mitmproxy/.env b/mitmproxy/.env
diff --git a/mitmproxy/.gitattributes b/mitmproxy/.gitattributes
diff --git a/mitmproxy/.gitignore b/mitmproxy/.gitignore
diff --git a/mitmproxy/libmproxy/version.py b/mitmproxy/libmproxy/version.py
@@ -1,11 +1,3 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 17)
-VERSION = ".".join(str(i) for i in IVERSION)
-MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
-NAME = "mitmproxy"
-NAMEVERSION = NAME + " " + VERSION
-
-NEXT_MINORVERSION = list(IVERSION)
-NEXT_MINORVERSION[1] += 1
-NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2])
+from netlib.version import *
diff --git a/mitmproxy/requirements.txt b/mitmproxy/requirements.txt
diff --git a/netlib/.appveyor.yml b/netlib/.appveyor.yml
diff --git a/netlib/.env b/netlib/.env
diff --git a/netlib/.gitignore b/netlib/.gitignore
diff --git a/netlib/.landscape.yml b/netlib/.landscape.yml
diff --git a/netlib/.travis.yml b/netlib/.travis.yml
diff --git a/netlib/CONTRIBUTORS b/netlib/CONTRIBUTORS
diff --git a/netlib/LICENSE b/netlib/LICENSE
diff --git a/netlib/check_coding_style.sh b/netlib/check_coding_style.sh
diff --git a/netlib/requirements.txt b/netlib/requirements.txt
diff --git a/pathod/.appveyor.yml b/pathod/.appveyor.yml
diff --git a/pathod/.env b/pathod/.env
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		mitmproxy/libmproxy/web/static/*/ -diff
		mitmproxy/web/src/js/filt/filt.js -diff