diff --git a/.gitignore b/.gitignore index 7e25e44..21047d2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /module-build-service-1.3.26.tar.gz /module-build-service-1.3.27.tar.gz /module-build-service-1.3.28.tar.gz +/module-build-service-1.3.29.tar.gz diff --git a/690.patch b/690.patch deleted file mode 100644 index 90cdc66..0000000 --- a/690.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 452cf473923e68c9a530573f592f7e7d29922890 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Sep 15 2017 16:50:51 +0000 -Subject: Make ldap3 optional, to workaround packaging issues. - - ---- - -diff --git a/module_build_service/auth.py b/module_build_service/auth.py -index 1b7c024..0c23729 100644 ---- a/module_build_service/auth.py -+++ b/module_build_service/auth.py -@@ -38,12 +38,16 @@ try: - except ImportError: - from flask import _request_ctx_stack as stack - from werkzeug.exceptions import Unauthorized as FlaskUnauthorized --import ldap3 - from dogpile.cache import make_region - - from module_build_service.errors import Unauthorized, Forbidden - from module_build_service import app, log, conf - -+try: -+ import ldap3 -+except ImportError: -+ log.warn("ldap3 import not found. ldap/krb disabled.") -+ - - client_secrets = None - region = make_region().configure('dogpile.cache.memory') - diff --git a/module-build-service.spec b/module-build-service.spec index 48c067f..425273f 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,5 +1,5 @@ Name: module-build-service -Version: 1.3.28 +Version: 1.3.29 Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -7,8 +7,6 @@ Group: Development/Tools License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz -# https://pagure.io/fm-orchestrator/pull-request/690.patch -Patch0: 690.patch BuildArch: noarch @@ -173,7 +171,6 @@ rm -f module_build_service/scheduler/consumer.pyc rm -f module_build_service/.mbs_local_build.db # XXX - Remove ldap3 until it is available for epel7 -%patch0 -p1 sed -i '/ldap3/d' requirements.txt rm -f tests/test_auth.py @@ -220,6 +217,9 @@ done %exclude %{python2_sitelib}/tests/ %changelog +* Mon Sep 18 2017 Ralph Bean - 1.3.29-1 +- new version + * Fri Sep 15 2017 Ralph Bean - 1.3.28-1 - new version diff --git a/sources b/sources index f29e886..3d4758d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.28.tar.gz) = 3962ea0bdc4791b2678edf8b723eb202782048dc19059724c8d23f486bf4b4761ba72db76cb7da9dd484e12f32f66992bd0b41d2b8b1242af129650c547378a9 +SHA512 (module-build-service-1.3.29.tar.gz) = 4a7b825c0226bd72fff0e167630496a92704c6503b75458e3870b24d2b544156f25135803a5f9860cbfcb7a563004d56b00abef5da7bc84247a75d6b9e645bd5