Fix requirements for Python 2.6.

This commit is contained in:
Murtuza Zabuawala
2018-04-04 12:26:44 +01:00
committed by Dave Page
parent a705fb46a8
commit b7c86da586
3 changed files with 48 additions and 15 deletions

View File

@@ -87,14 +87,20 @@ setup(
extras_require={ extras_require={
# ... # ...
":python_version<'2.7'": [ ":python_version<'2.7'": [
"ordereddict", "Flask-Script", "ordereddict",
"psycopg2==2.7.3.2", "pycrypto==2.6.1" "Flask-Script",
"psycopg2==2.7.3.2",
"pycrypto==2.6.1",
"python-dateutil==2.5.0"
], ],
":python_version<='2.7'": [ ":python_version<='2.7'": [
"backports.csv", "importlib" "backports.csv", "importlib"
], ],
":python_version>='2.7'": [ ":python_version>='2.7'": [
"Flask-HTMLmin", "psycopg2>=2.7.3.2", "pycryptodome" "Flask-HTMLmin",
"psycopg2>=2.7.3.2",
"pycryptodome",
"python-dateutil>=2.7.1"
] ]
}, },

View File

@@ -1,12 +1,13 @@
##############################################################################
# NOTE: Any requirements with environment specifiers must be explicitly added # NOTE: Any requirements with environment specifiers must be explicitly added
# to pkg/pip/setup_pip.py (in extras_require), otherwise they will be # to pkg/pip/setup_pip.py (in extras_require), otherwise they will be
# ignored when building a PIP Wheel. # ignored when building a PIP Wheel.
##############################################################################
blinker==1.4 blinker==1.4
extras==1.0.0 extras==1.0.0
fixtures==3.0.0 fixtures==3.0.0
Flask==0.12.2 Flask==0.12.2
Flask-Gravatar==0.5.0 Flask-Gravatar==0.5.0
Flask-HTMLmin==1.3.2; python_version >= '2.7'
Flask-Login==0.3.2 Flask-Login==0.3.2
Flask-Mail==0.9.1 Flask-Mail==0.9.1
Flask-Migrate==2.1.1 Flask-Migrate==2.1.1
@@ -15,17 +16,10 @@ Flask-Security==3.0.0
Flask-SQLAlchemy==2.3.2 Flask-SQLAlchemy==2.3.2
Flask-WTF==0.14.2 Flask-WTF==0.14.2
html5lib==1.0.1 html5lib==1.0.1
importlib==1.0.3; python_version <= '2.7'
linecache2==1.0.0 linecache2==1.0.0
ordereddict; python_version < '2.7'
passlib==1.7.1 passlib==1.7.1
pbr==3.1.1 pbr==3.1.1
psycopg2>=2.7.4; python_version >= '2.7'
psycopg2==2.7.3.2; python_version < '2.7'
pycrypto==2.6.1; python_version < '2.7'
pycryptodome; python_version >= '2.7'
pyrsistent==0.14.2 pyrsistent==0.14.2
python-dateutil==2.7.1
python-mimeparse==1.6.0 python-mimeparse==1.6.0
pytz==2018.3 pytz==2018.3
simplejson==3.13.2 simplejson==3.13.2
@@ -34,6 +28,27 @@ speaklater==1.3
SQLAlchemy==1.2.5 SQLAlchemy==1.2.5
sqlparse==0.2.4 sqlparse==0.2.4
WTForms==2.1 WTForms==2.1
backports.csv==1.0.5; python_version <= '2.7'
Flask-Paranoid==0.2.0 Flask-Paranoid==0.2.0
################################################################
# Modules specifically requires for Python2.7 or greater version
################################################################
psycopg2>=2.7.4; python_version >= '2.7'
pycryptodome; python_version >= '2.7'
python-dateutil>=2.7.1; python_version >= '2.7'
Flask-HTMLmin==1.3.2; python_version >= '2.7'
###############################################################
# Modules specifically required for Python2.7 or lesser version
###############################################################
backports.csv==1.0.5; python_version <= '2.7'
importlib==1.0.3; python_version <= '2.7'
###############################################################
# Modules required for Python2.6
###############################################################
psycopg2==2.7.3.2; python_version < '2.7'
pycrypto==2.6.1; python_version < '2.7'
Flask-Script==2.0.5; python_version < '2.7' Flask-Script==2.0.5; python_version < '2.7'
ordereddict; python_version < '2.7'
python-dateutil==2.5.0; python_version < '2.7'

View File

@@ -8,12 +8,24 @@
########################################### ###########################################
pycodestyle==2.3.1 pycodestyle==2.3.1
pyperclip~=1.6.0 pyperclip~=1.6.0
selenium==3.3.3; python_version < '2.7'
selenium==3.11.0; python_version >= '2.7'
testscenarios==0.5.0 testscenarios==0.5.0
testtools==2.3.0 testtools==2.3.0
traceback2==1.4.0 traceback2==1.4.0
unittest2==1.1.0 unittest2==1.1.0
################################################################
# Modules specifically requires for Python2.7 or greater version
################################################################
selenium==3.11.0; python_version >= '2.7'
###############################################################
# Modules required for Python2.6
###############################################################
selenium==3.3.3; python_version < '2.7'
###############################################################
# Modules specifically required for Python3.3 or lesser version
###############################################################
mock===2.0.0; python_version < '3.3' mock===2.0.0; python_version < '3.3'
# Leave this at the end because there is a bug where the '--install-option' # Leave this at the end because there is a bug where the '--install-option'