From 965f2c3a71b336b0e279c9639fa39f0a29b33dc2acd3faa8f5b0629ddd914ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 14 May 2020 06:36:28 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:flask/python-Flask-Security-Too?expand=0&rev=7 --- no-setup-dependencies.patch | 21 +++++++++++++++++++++ python-Flask-Security-Too.changes | 8 ++++++++ python-Flask-Security-Too.spec | 9 +++++---- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 no-setup-dependencies.patch diff --git a/no-setup-dependencies.patch b/no-setup-dependencies.patch new file mode 100644 index 0000000..664f113 --- /dev/null +++ b/no-setup-dependencies.patch @@ -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", diff --git a/python-Flask-Security-Too.changes b/python-Flask-Security-Too.changes index 8c788dc..15cad56 100644 --- a/python-Flask-Security-Too.changes +++ b/python-Flask-Security-Too.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 14 06:27:54 UTC 2020 - Tomáš Chvátal + +- 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 diff --git a/python-Flask-Security-Too.spec b/python-Flask-Security-Too.spec index cf07357..0a0d07a 100644 --- a/python-Flask-Security-Too.spec +++ b/python-Flask-Security-Too.spec @@ -26,6 +26,7 @@ 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 BuildRequires: %{python_module Babel >= 1.3} BuildRequires: %{python_module Flask >= 1.0.2} BuildRequires: %{python_module Flask-BabelEx >= 0.9.3} @@ -40,6 +41,7 @@ BuildRequires: %{python_module Werkzeug >= 0.15.5} BuildRequires: %{python_module argon2_cffi >= 19.1.0} BuildRequires: %{python_module bcrypt >= 3.1.5} BuildRequires: %{python_module cachetools >= 3.1.0} +BuildRequires: %{python_module cryptography >= 2.3.1} BuildRequires: %{python_module email_validator >= 1.0.5} BuildRequires: %{python_module itsdangerous >= 1.1.0} BuildRequires: %{python_module mock >= 1.3.0} @@ -47,10 +49,8 @@ BuildRequires: %{python_module passlib >= 1.7.1} BuildRequires: %{python_module peewee >= 3.11.2} 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 @@ -62,6 +62,7 @@ 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-cryptography >= 2.3.1 Requires: python-email_validator >= 1.0.5 Requires: python-itsdangerous >= 1.1.0 Requires: python-passlib >= 1.7.1 @@ -83,7 +84,7 @@ 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 %build