diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | requirements.txt | 11 | ||||
| -rw-r--r-- | setup.py | 62 | ||||
| -rw-r--r-- | test/requirements.txt | 4 |
4 files changed, 41 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml index 2cc19030..7c4dca92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,7 @@ python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" - - "pip install -r requirements.txt --use-mirrors" - - "pip install -r test/requirements.txt --use-mirrors" + - "pip install --src .. -r requirements.txt" # command to run tests, e.g. python setup.py test script: - "nosetests --with-cov --cov-report term-missing" diff --git a/requirements.txt b/requirements.txt index de91b65e..69bd183b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,2 @@ -Flask>=0.10.1 -Jinja2>=2.7.1 -MarkupSafe>=0.18 -Werkzeug>=0.9.4 -itsdangerous>=0.23 -pyOpenSSL>=0.13.1 -pyasn1>=0.1.7 -requests>=2.4.0 -netlib>=0.10
\ No newline at end of file +-e git+https://github.com/mitmproxy/netlib.git#egg=netlib +-e .[dev]
\ No newline at end of file @@ -2,6 +2,7 @@ from distutils.core import setup import fnmatch, os.path from libpathod import version + def _fnmatch(name, patternList): for i in patternList: if fnmatch.fnmatch(name, i): @@ -64,31 +65,44 @@ def findPackages(path, dataExclude=[]): package_data[module] = acc return packages, package_data +with open("README.txt", "rb") as f: + long_description = f.read() -long_description = file("README.txt","rb").read() packages, package_data = findPackages("libpathod") setup( - name = "pathod", - version = version.VERSION, - description = "A pathological HTTP/S daemon for testing and stressing clients.", - long_description = long_description, - author = "Aldo Cortesi", - author_email = "aldo@corte.si", - url = "http://pathod.net", - packages = packages, - package_data = package_data, - scripts = ["pathod", "pathoc"], - classifiers = [ - "License :: OSI Approved :: MIT License", - "Development Status :: 5 - Production/Stable", - "Operating System :: POSIX", - "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Topic :: Internet", - "Topic :: Internet :: WWW/HTTP :: HTTP Servers", - "Topic :: Software Development :: Testing", - "Topic :: Software Development :: Testing :: Traffic Generation", - "Topic :: Internet :: WWW/HTTP", - ], - install_requires=['netlib>=%s'%version.MINORVERSION, "requests>=2.4.0", "Flask>=0.10.1"] + name="pathod", + version=version.VERSION, + description="A pathological HTTP/S daemon for testing and stressing clients.", + long_description=long_description, + author="Aldo Cortesi", + author_email="aldo@corte.si", + url="http://pathod.net", + packages=packages, + package_data=package_data, + scripts=["pathod", "pathoc"], + classifiers=[ + "License :: OSI Approved :: MIT License", + "Development Status :: 5 - Production/Stable", + "Operating System :: POSIX", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Topic :: Internet", + "Topic :: Internet :: WWW/HTTP :: HTTP Servers", + "Topic :: Software Development :: Testing", + "Topic :: Software Development :: Testing :: Traffic Generation", + "Topic :: Internet :: WWW/HTTP", + ], + install_requires=[ + 'netlib>=%s' % version.MINORVERSION, + "requests>=2.4.0", + "Flask>=0.10.1" + ], + extras_require={ + 'dev': [ + "mock>=1.0.1", + "nose>=1.3.0", + "nose-cov>=1.6", + "coveralls>=0.4.1" + ] + } ) diff --git a/test/requirements.txt b/test/requirements.txt deleted file mode 100644 index 1bfe2b7b..00000000 --- a/test/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -mock>=1.0.1 -nose>=1.3.0 -nose-cov>=1.6 -coveralls>=0.4.1
\ No newline at end of file |