From 8815b4d36040adf29b66b7823a7196584da28513 Mon Sep 17 00:00:00 2001 From: Alex Bluvstein Date: Wed, 5 Dec 2018 13:36:11 +0200 Subject: [PATCH 1/5] Release --- .travis.yml | 2 +- dev-requirements.txt | 1 + requirements.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 15ca9ae..2be81c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.7" # command to install dependencies install: - - pip install -r requirements.txt + - pip install -r dev-requirements.txt # command to run tests script: - python -m unittest discover -s ./test -p 'test*' diff --git a/dev-requirements.txt b/dev-requirements.txt index b0e569a..79df4d3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,3 +5,4 @@ requests_mock==1.5.2 setuptools==40.6.2 Crypto pylint + diff --git a/requirements.txt b/requirements.txt index 03cb7ad..db547af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Crypto pystache==0.5.4 requests==2.20.1 + From 9a2465d97affda3ab3720f15319dd786fcca2cc9 Mon Sep 17 00:00:00 2001 From: alexbpx <41577203+alexbpx@users.noreply.github.com> Date: Wed, 5 Dec 2018 13:43:03 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) 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 +``` From 22134d6100781f0b395f94d336854af2c5d0904b Mon Sep 17 00:00:00 2001 From: Alex Bluvstein Date: Wed, 5 Dec 2018 13:47:53 +0200 Subject: [PATCH 3/5] Cahnged dependecies --- requirements.txt | 2 +- setup.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index db547af..2f8d218 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ Crypto pystache==0.5.4 requests==2.20.1 - +setuptools==40.6.2 diff --git a/setup.py b/setup.py index c4e3e0c..9334ff7 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ 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', 'Crypto'], classifiers=['Intended Audience :: Developers', 'Programming Language :: Python :: 2.7']) From e5d6bba65530d7e69320eaad47662bfc9792bcfd Mon Sep 17 00:00:00 2001 From: Alex Bluvstein Date: Wed, 5 Dec 2018 14:00:22 +0200 Subject: [PATCH 4/5] Cahnged dependecies --- .travis.yml | 1 + dev-requirements.txt | 5 ++--- requirements.txt | 2 +- setup.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2be81c3..5be5e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: # command to install dependencies install: - pip install -r dev-requirements.txt + - pip install -r requirements.txt # command to run tests script: - python -m unittest discover -s ./test -p 'test*' diff --git a/dev-requirements.txt b/dev-requirements.txt index 79df4d3..3ee77a8 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,6 +3,5 @@ mock==2.0.0 requests==2.20.1 requests_mock==1.5.2 setuptools==40.6.2 -Crypto -pylint - +pycrypto==2.6.1 +pylint==1.9.3 diff --git a/requirements.txt b/requirements.txt index 2f8d218..b5848e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +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 9334ff7..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,7 +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', 'Crypto'], + install_requires=install_requires, classifiers=['Intended Audience :: Developers', 'Programming Language :: Python :: 2.7']) From 0c73edcb6ca332bbd5005cb94977ccf1c767083e Mon Sep 17 00:00:00 2001 From: Yaron Schwimmer Date: Wed, 5 Dec 2018 14:46:51 +0200 Subject: [PATCH 5/5] Update dev-requirements.txt --- dev-requirements.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 3ee77a8..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 -pycrypto==2.6.1 pylint==1.9.3