From c22a86f71b92041fb38bf437f15c9b85d67359e7 Mon Sep 17 00:00:00 2001 From: Alex Bluvstein Date: Wed, 5 Dec 2018 13:27:24 +0200 Subject: [PATCH 1/3] Added readme --- README.md | 15 +++++++++++++++ dev-requirements.txt | 7 +++++++ requirements.txt | 6 +----- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 dev-requirements.txt diff --git a/README.md b/README.md index 5d03f33..f0b04a3 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,26 @@ Table of Contents ## Installation PerimeterX Python middleware is installed via PIP: `$ pip install perimeterx-python-wsgi` +After the installation, go to your django working dir and verify that the +INSTALLED_APPS clause in your settings.py file contains 'perimeterx' . +``` +INSTALLED_APPS = [ + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'perimeterx', +] +``` ## 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', diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000..b0e569a --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,7 @@ +pystache==0.5.4 +mock==2.0.0 +requests==2.20.1 +requests_mock==1.5.2 +setuptools==40.6.2 +Crypto +pylint diff --git a/requirements.txt b/requirements.txt index dea6cd4..03cb7ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,3 @@ +Crypto 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 From b7aa2a0435ca69a1c0b303521e4e16ce7596d306 Mon Sep 17 00:00:00 2001 From: Ilai Fallach Date: Wed, 5 Dec 2018 13:30:07 +0200 Subject: [PATCH 2/3] Fixed copying resources to package on pypi. --- CHANGELOG.md | 6 ++++-- README.md | 2 +- setup.py | 12 ++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) 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 51a0f85..15a9ce9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![image](https://s.perimeterx.net/logo.png) [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) diff --git a/setup.py b/setup.py index 6b06b37..c4e3e0c 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ #!/usr/bin/env python -from setuptools import setup +from setuptools import setup, find_packages -version = 'v2.0.0' +version = 'v2.0.1' setup(name='perimeterx-python-wsgi', version=version, license='MIT', @@ -11,10 +11,10 @@ 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'}, + packages=find_packages(exclude=['dev', 'test*']), + package_data={'perimeterx': ['templates/*']}, 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'], + "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'], classifiers=['Intended Audience :: Developers', 'Programming Language :: Python :: 2.7']) - From 891e987d66d8324e1e11697c774179edc5b731be Mon Sep 17 00:00:00 2001 From: alexbpx <41577203+alexbpx@users.noreply.github.com> Date: Wed, 5 Dec 2018 14:59:00 +0200 Subject: [PATCH 3/3] Dev crypto replacement (#28) * Release * Update README.md * Cahnged dependecies * Cahnged dependecies * Update dev-requirements.txt --- .travis.yml | 1 + README.md | 15 ++------------- dev-requirements.txt | 6 +----- requirements.txt | 3 ++- setup.py | 5 ++--- 5 files changed, 8 insertions(+), 22 deletions(-) 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/README.md b/README.md index 3ad109b..4e5891d 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,7 @@ Table of Contents ## Installation PerimeterX Python middleware is installed via PIP: `$ pip install perimeterx-python-wsgi` -After the installation, go to your django working dir and verify that the -INSTALLED_APPS clause in your settings.py file contains 'perimeterx' . -``` -INSTALLED_APPS = [ - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'perimeterx', -] -``` + ## Upgrading Contact [PerimeterX Support](mailto: support@perimeterx.com) for details. ## Required Configurations @@ -189,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 index b0e569a..67acd33 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,3 @@ -pystache==0.5.4 mock==2.0.0 -requests==2.20.1 requests_mock==1.5.2 -setuptools==40.6.2 -Crypto -pylint +pylint==1.9.3 diff --git a/requirements.txt b/requirements.txt index 03cb7ad..b5848e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ -Crypto +pycrypto==2.6.1 pystache==0.5.4 requests==2.20.1 +setuptools==40.6.2 diff --git a/setup.py b/setup.py index c4e3e0c..a1c6e80 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ from setuptools import setup, find_packages +install_requires = open('./requirements.txt', 'r').readlines() version = 'v2.0.1' setup(name='perimeterx-python-wsgi', version=version, @@ -13,8 +14,6 @@ download_url='https://github.com/PerimeterX/perimeterx-python-wsgi/tarball/' + version, packages=find_packages(exclude=['dev', 'test*']), package_data={'perimeterx': ['templates/*']}, - 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'], + install_requires=install_requires, classifiers=['Intended Audience :: Developers', 'Programming Language :: Python :: 2.7'])