Accepting request 805566 from devel:languages:python:flask

OBS-URL: https://build.opensuse.org/request/show/805566
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Flask-Security-Too?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2020-05-14 21:27:12 +00:00 committed by Git OBS Bridge
commit 8b0e17cc2f
4 changed files with 208 additions and 10 deletions

149
fix-dependencies.patch Normal file
View File

@ -0,0 +1,149 @@
Index: Flask-Security-Too-3.4.2/setup.py
===================================================================
--- Flask-Security-Too-3.4.2.orig/setup.py
+++ Flask-Security-Too-3.4.2/setup.py
@@ -14,20 +14,19 @@ with io.open("flask_security/__init__.py
tests_require = [
"Flask-Mongoengine>=0.9.5",
- "peewee>=3.11.2",
+ "peewee>=3.7.1",
"Flask-SQLAlchemy>=2.3",
"argon2_cffi>=19.1.0",
- "bcrypt>=3.1.5",
+ "bcrypt>=3.1.4",
"cachetools>=3.1.0",
"check-manifest>=0.25",
"coverage>=4.5.4",
- "cryptography>=2.3.1",
+ "cryptography>=2.1.4",
"isort>=4.2.2",
"mock>=1.3.0",
"mongoengine>=0.15.3",
"mongomock>=3.14.0",
"msgcheck>=2.9",
- "pony>=0.7.11",
"phonenumberslite>=8.11.1",
"psycopg2>=2.8.4",
"pydocstyle>=1.0.0",
@@ -41,7 +40,7 @@ tests_require = [
"pytest>=3.5.1",
"sqlalchemy>=1.2.6",
"sqlalchemy-utils>=0.33.0",
- "werkzeug>=0.15.5",
+ "werkzeug>=0.14.1",
"zxcvbn~=4.4.28",
]
Index: Flask-Security-Too-3.4.2/Flask_Security_Too.egg-info/requires.txt
===================================================================
--- Flask-Security-Too-3.4.2.orig/Flask_Security_Too.egg-info/requires.txt
+++ Flask-Security-Too-3.4.2/Flask_Security_Too.egg-info/requires.txt
@@ -13,20 +13,19 @@ Pallets-Sphinx-Themes>=1.2.0
Sphinx>=1.8.5
sphinx-issues>=1.2.0
Flask-Mongoengine>=0.9.5
-peewee>=3.11.2
+peewee>=3.7.1
Flask-SQLAlchemy>=2.3
argon2_cffi>=19.1.0
-bcrypt>=3.1.5
+bcrypt>=3.1.4
cachetools>=3.1.0
check-manifest>=0.25
coverage>=4.5.4
-cryptography>=2.3.1
+cryptography>=2.1.4
isort>=4.2.2
mock>=1.3.0
mongoengine>=0.15.3
mongomock>=3.14.0
msgcheck>=2.9
-pony>=0.7.11
phonenumberslite>=8.11.1
psycopg2>=2.8.4
pydocstyle>=1.0.0
@@ -40,26 +39,25 @@ pytest-mongo>=1.2.1
pytest>=3.5.1
sqlalchemy>=1.2.6
sqlalchemy-utils>=0.33.0
-werkzeug>=0.15.5
+werkzeug>=0.14.1
zxcvbn~=4.4.28
Pallets-Sphinx-Themes>=1.2.0
Sphinx>=1.8.5
sphinx-issues>=1.2.0
Flask-Mongoengine>=0.9.5
-peewee>=3.11.2
+peewee>=3.7.1
Flask-SQLAlchemy>=2.3
argon2_cffi>=19.1.0
-bcrypt>=3.1.5
+bcrypt>=3.1.4
cachetools>=3.1.0
check-manifest>=0.25
coverage>=4.5.4
-cryptography>=2.3.1
+cryptography>=2.1.4
isort>=4.2.2
mock>=1.3.0
mongoengine>=0.15.3
mongomock>=3.14.0
msgcheck>=2.9
-pony>=0.7.11
phonenumberslite>=8.11.1
psycopg2>=2.8.4
pydocstyle>=1.0.0
@@ -73,7 +71,7 @@ pytest-mongo>=1.2.1
pytest>=3.5.1
sqlalchemy>=1.2.6
sqlalchemy-utils>=0.33.0
-werkzeug>=0.15.5
+werkzeug>=0.14.1
zxcvbn~=4.4.28
[docs]
@@ -83,20 +81,19 @@ sphinx-issues>=1.2.0
[tests]
Flask-Mongoengine>=0.9.5
-peewee>=3.11.2
+peewee>=3.7.1
Flask-SQLAlchemy>=2.3
argon2_cffi>=19.1.0
-bcrypt>=3.1.5
+bcrypt>=3.1.4
cachetools>=3.1.0
check-manifest>=0.25
coverage>=4.5.4
-cryptography>=2.3.1
+cryptography>=2.1.4
isort>=4.2.2
mock>=1.3.0
mongoengine>=0.15.3
mongomock>=3.14.0
msgcheck>=2.9
-pony>=0.7.11
phonenumberslite>=8.11.1
psycopg2>=2.8.4
pydocstyle>=1.0.0
@@ -110,5 +107,5 @@ pytest-mongo>=1.2.1
pytest>=3.5.1
sqlalchemy>=1.2.6
sqlalchemy-utils>=0.33.0
-werkzeug>=0.15.5
+werkzeug>=0.14.1
zxcvbn~=4.4.28
Index: Flask-Security-Too-3.4.2/tests/conftest.py
===================================================================
--- Flask-Security-Too-3.4.2.orig/tests/conftest.py
+++ Flask-Security-Too-3.4.2/tests/conftest.py
@@ -617,7 +617,7 @@ def get_message(app):
@pytest.fixture(
- params=["sqlalchemy", "sqlalchemy-session", "peewee", "pony"]
+ params=["sqlalchemy", "sqlalchemy-session", "peewee"]
)
def datastore(request, app, tmpdir, realdburl):
if request.param == "sqlalchemy":

View File

@ -0,0 +1,21 @@
Index: Flask-Security-Too-3.4.2/setup.py
===================================================================
--- Flask-Security-Too-3.4.2.orig/setup.py
+++ Flask-Security-Too-3.4.2/setup.py
@@ -54,8 +54,6 @@ extras_require["all"] = []
for reqs in extras_require.values():
extras_require["all"].extend(reqs)
-setup_requires = ["Babel>=1.3", "pytest-runner>=2.6.2", "twine", "wheel"]
-
install_requires = [
"Flask>=1.0.2",
"Flask-Login>=0.4.1",
@@ -93,7 +91,6 @@ setup(
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*",
extras_require=extras_require,
install_requires=install_requires,
- setup_requires=setup_requires,
tests_require=tests_require,
classifiers=[
"Environment :: Web Environment",

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Thu May 14 07:12:48 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
- Decrease dependencies which aren't really required so we can build
in SLE/Leap:
* Werkzeug 0.15.5 requirement decreased to 0.14.1
* cryptography 2.3.1 requirement decreased to 2.1.4
* bcrypt 3.1.5 requirement decreased to 3.1.4
* peewee 3.11.2 requirement decreased to 3.7.1
* Remove python-pony requirement
- Add patch that applies previous dependency changes:
* fix-dependencies.patch
-------------------------------------------------------------------
Thu May 14 06:27:54 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to not pull in babel/twine/pytest-runner as
upstream needs those but we really don't require them during
a rpm build:
* no-setup-dependencies.patch
-------------------------------------------------------------------
Thu May 7 10:42:20 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

View File

@ -26,6 +26,8 @@ License: MIT
URL: https://github.com/jwag956/flask-security
Source: https://files.pythonhosted.org/packages/source/F/Flask-Security-Too/Flask-Security-Too-%{version}.tar.gz
Patch0: no-mongodb.patch
Patch1: no-setup-dependencies.patch
Patch2: fix-dependencies.patch
BuildRequires: %{python_module Babel >= 1.3}
BuildRequires: %{python_module Flask >= 1.0.2}
BuildRequires: %{python_module Flask-BabelEx >= 0.9.3}
@ -36,21 +38,19 @@ BuildRequires: %{python_module Flask-SQLAlchemy >= 2.3}
BuildRequires: %{python_module Flask-WTF >= 0.14.2}
BuildRequires: %{python_module PyQRCode >= 1.2}
BuildRequires: %{python_module SQLAlchemy >= 1.2.6}
BuildRequires: %{python_module Werkzeug >= 0.15.5}
BuildRequires: %{python_module Werkzeug >= 0.14.1}
BuildRequires: %{python_module argon2_cffi >= 19.1.0}
BuildRequires: %{python_module bcrypt >= 3.1.5}
BuildRequires: %{python_module bcrypt >= 3.1.4}
BuildRequires: %{python_module cachetools >= 3.1.0}
BuildRequires: %{python_module cryptography >= 2.1.4}
BuildRequires: %{python_module email_validator >= 1.0.5}
BuildRequires: %{python_module itsdangerous >= 1.1.0}
BuildRequires: %{python_module mock >= 1.3.0}
BuildRequires: %{python_module passlib >= 1.7.1}
BuildRequires: %{python_module peewee >= 3.11.2}
BuildRequires: %{python_module peewee >= 3.7.1}
BuildRequires: %{python_module phonenumbers >= 8.11.1}
BuildRequires: %{python_module pony >= 0.7.11}
BuildRequires: %{python_module pytest-runner >= 2.6.2}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module twine}
BuildRequires: %{python_module wheel}
BuildRequires: %{python_module zxcvbn >= 4.4.28}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -60,8 +60,9 @@ Requires: python-Flask-Login >= 0.4.1
Requires: python-Flask-Mail >= 0.9.1
Requires: python-Flask-Principal >= 0.4.0
Requires: python-Flask-WTF >= 0.14.2
Requires: python-Werkzeug >= 0.15.5
Requires: python-bcrypt >= 3.1.5
Requires: python-Werkzeug >= 0.14.1
Requires: python-bcrypt >= 3.1.4
Requires: python-cryptography >= 2.1.4
Requires: python-email_validator >= 1.0.5
Requires: python-itsdangerous >= 1.1.0
Requires: python-passlib >= 1.7.1
@ -83,9 +84,15 @@ based on the 3.0.0 version of the original.
%prep
%setup -q -n Flask-Security-Too-%{version}
%patch0 -p1
%autopatch -p1
rm pytest.ini
%if 0%{?suse_version} <= 1500
# test_trackable.py needs werkzeug.middleware.proxy_fix which is only available
# in newer werkzeug versions
rm tests/test_trackable.py
%endif
%build
%python_build