diff --git a/.travis.yml b/.travis.yml index 15ca9ae..5be5e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ python: - "2.7" # command to install dependencies install: + - pip install -r dev-requirements.txt - pip install -r requirements.txt # command to run tests script: diff --git a/CHANGELOG.md b/CHANGELOG.md index b82e750..a342d2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## [v2.0.1](https://github.com/PerimeterX/perimeterx-python-wsgi) (2018-12-05) +- Fixed copying resources to package on pypi. + ## [v2.0.0](https://github.com/PerimeterX/perimeterx-python-wsgi/compare/v1.0.17...HEAD) (2018-12-03) - Added Major Enforcer functionalities: Mobile SDK, FirstParty, CaptchaV2, Block handling - Added unit tests @@ -14,5 +17,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Added UUID to page requested - New block/captcha templates - Delete captcha cookie after evaluation -- Sending original cookie value when decryption fails - +- Sending original cookie value when decryption fails \ No newline at end of file diff --git a/README.md b/README.md index 5d03f33..4e5891d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [PerimeterX](http://www.perimeterx.com) Python Middleware ============================================================= -> Latest stable version: [v2.0.0](https://pypi.org/project/perimeterx-python-wsgi/) +> Latest stable version: [v2.0.1](https://pypi.org/project/perimeterx-python-wsgi/) Table of Contents ----------------- - [Installation](#installation) @@ -27,11 +27,15 @@ Table of Contents ## Installation PerimeterX Python middleware is installed via PIP: `$ pip install perimeterx-python-wsgi` + ## Upgrading Contact [PerimeterX Support](mailto: support@perimeterx.com) for details. ## Required Configurations To use PerimeterX middleware on a specific route follow this example: + ```python +from perimeterx.middleware import PerimeterX + px_config = { 'app_id': 'APP_ID', 'cookie_key': 'COOKIE_KEY', @@ -174,4 +178,4 @@ config = { additional_activity_handler: additional_activity_handler_function, ... } -``` \ No newline at end of file +``` diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000..67acd33 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,3 @@ +mock==2.0.0 +requests_mock==1.5.2 +pylint==1.9.3 diff --git a/requirements.txt b/requirements.txt index dea6cd4..b5848e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,4 @@ +pycrypto==2.6.1 pystache==0.5.4 -mock==2.0.0 requests==2.20.1 -requests_mock==1.5.2 setuptools==40.6.2 -pycrypto==2.6.1 -pylint diff --git a/setup.py b/setup.py index 6b06b37..a1c6e80 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from setuptools import setup +from setuptools import setup, find_packages -version = 'v2.0.0' +install_requires = open('./requirements.txt', 'r').readlines() +version = 'v2.0.1' setup(name='perimeterx-python-wsgi', version=version, license='MIT', @@ -11,10 +12,8 @@ author_email='ben@perimeterx.com', url='https://github.com/PerimeterX/perimeterx-python-wsgi', download_url='https://github.com/PerimeterX/perimeterx-python-wsgi/tarball/' + version, - package_dir={'perimeterx': 'perimeterx'}, - install_requires=[ - "pystache==0.5.4", 'requests==2.20.1', 'setuptools==40.6.2', 'requests_mock==1.5.2', - 'pycrypto==2.6.1', 'mock==2.0.0', 'pylint'], + packages=find_packages(exclude=['dev', 'test*']), + package_data={'perimeterx': ['templates/*']}, + install_requires=install_requires, classifiers=['Intended Audience :: Developers', 'Programming Language :: Python :: 2.7']) -