Remove entry points in favor of vanilla scripts, fix test-release

This commit is contained in:
Aldo Cortesi 2014-11-11 14:00:28 +13:00
parent 5025bf872c
commit ec17e70d9e
2 changed files with 9 additions and 17 deletions

View File

@ -23,15 +23,16 @@ python ./setup.py -q sdist --dist-dir $DST
echo "Creating virtualenv for test install..." echo "Creating virtualenv for test install..."
virtualenv -q $DST/venv virtualenv -q $DST/venv
cd $DST
echo "Installing netlib..." echo "Installing netlib..."
$DST/venv/bin/pip -q install --download-cache ~/.pipcache $DST/netlib* ./venv/bin/pip -q install --download-cache ~/.pipcache ./netlib*
echo "Installing pathod..." echo "Installing pathod..."
$DST/venv/bin/pip -q install --download-cache ~/.pipcache $DST/pathod* ./venv/bin/pip -q install --download-cache ~/.pipcache ./pathod*
echo "Installing mitmproxy..." echo "Installing mitmproxy..."
$DST/venv/bin/pip -q install --download-cache ~/.pipcache $DST/mitmproxy* ./venv/bin/pip -q install --download-cache ~/.pipcache ./mitmproxy*
echo "Running binaries..." echo "Running binaries..."
$DST/venv/bin/mitmproxy --version ./venv/bin/mitmproxy --version
$DST/venv/bin/mitmdump --version ./venv/bin/mitmdump --version
$DST/venv/bin/pathod --version ./venv/bin/pathod --version
$DST/venv/bin/pathoc --version ./venv/bin/pathoc --version

View File

@ -36,10 +36,6 @@ for script in scripts:
if os.name == "nt": if os.name == "nt":
deps.add("pydivert>=0.0.4") # Transparent proxying on Windows deps.add("pydivert>=0.0.4") # Transparent proxying on Windows
console_scripts = [
"%s = libmproxy.main:%s" % (s, s) for s in scripts
]
setup( setup(
name="mitmproxy", name="mitmproxy",
@ -66,14 +62,9 @@ setup(
"Topic :: Internet :: Proxy Servers", "Topic :: Internet :: Proxy Servers",
"Topic :: Software Development :: Testing" "Topic :: Software Development :: Testing"
], ],
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
scripts = scripts,
entry_points={
'console_scripts': console_scripts
},
install_requires=list(deps), install_requires=list(deps),
extras_require={ extras_require={
'dev': [ 'dev': [