From fcbbe3a057823bd3facc6630afd633e91e086848 Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Jun 07 2018 19:29:00 +0000
Subject: Update to 0.25.0 (#1588214)


---

diff --git a/.gitignore b/.gitignore
index 7ef7a15..1516cc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /acme-0.22.2.tar.gz
 /acme-0.23.0.tar.gz
 /acme-0.24.0.tar.gz
+/acme-0.25.0.tar.gz
diff --git a/epel7-setup.patch b/epel7-setup.patch
index 37a6f9f..f23089d 100644
--- a/epel7-setup.patch
+++ b/epel7-setup.patch
@@ -1,13 +1,13 @@
 diff --git a/setup.py b/setup.py
-index 9345878..e57b719 100644
+index e24f4297..9025e493 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -18,7 +18,7 @@ install_requires = [
+@@ -17,7 +17,7 @@ install_requires = [
      'PyOpenSSL>=0.13',
      'pyrfc3339',
      'pytz',
 -    'requests[security]>=2.4.1',  # security extras added in 2.4.1
 +    'requests',
+     'requests-toolbelt>=0.3.0',
      'setuptools',
      'six>=1.9.0',  # needed for python_2_unicode_compatible
- ]
diff --git a/epel7-testing.patch b/epel7-testing.patch
new file mode 100644
index 0000000..ea50104
--- /dev/null
+++ b/epel7-testing.patch
@@ -0,0 +1,10 @@
+diff --git a/pytest.ini b/pytest.ini
+new file mode 100644
+index 00000000..3480fd9a
+--- /dev/null
++++ b/pytest.ini
+@@ -0,0 +1,4 @@
++# Work around old versions of pytest not excluding build/ from its search for
++# test files
++[pytest]
++norecursedirs = .* build dist CVS _darcs {arch} *.egg venv
diff --git a/python-acme.spec b/python-acme.spec
index d5c7219..8aa49e4 100644
--- a/python-acme.spec
+++ b/python-acme.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           python-acme
-Version:        0.24.0
+Version:        0.25.0
 Release:        1%{?dist}
 Summary:        Python library for the ACME protocol
 License:        ASL 2.0
@@ -18,6 +18,7 @@ Source0:        https://files.pythonhosted.org/packages/source/a/%{srcname}/%{sr
 
 %if 0%{?rhel}
 Patch0:         epel7-setup.patch
+Patch1:         epel7-testing.patch
 %endif
 
 BuildRequires:  python2-devel
@@ -37,6 +38,7 @@ BuildRequires:  python3-sphinx
 BuildRequires:  python3-cryptography
 BuildRequires:  python3-pyOpenSSL >= 0.13
 BuildRequires:  python3-requests
+BuildRequires:  python3-requests-toolbelt
 BuildRequires:  python3-pyrfc3339
 BuildRequires:  python3-josepy
 %endif
@@ -50,12 +52,16 @@ BuildRequires:  pytz
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # EL7 has unversioned names for these packages
+BuildRequires:  pytest
 BuildRequires:  python-ndg_httpsclient
 BuildRequires:  python-nose
+BuildRequires:  python-requests-toolbelt
 BuildRequires:  pyOpenSSL >= 0.13
 %else
 BuildRequires:  python2-ndg_httpsclient
 BuildRequires:  python2-nose
+BuildRequires:  python2-pytest
+BuildRequires:  python2-requests-toolbelt
 BuildRequires:  python2-pyOpenSSL >= 0.13
 %endif
 
@@ -63,6 +69,7 @@ BuildRequires:  python2-pyOpenSSL >= 0.13
 BuildRequires:  python3-ndg_httpsclient
 BuildRequires:  python3-nose
 BuildRequires:  python3-mock
+BuildRequires:  python3-pytest
 BuildRequires:  python3-pytz
 %endif
 
@@ -86,9 +93,11 @@ Requires:       pytz
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # EL7 has unversioned names for these packages
 Requires:       python-ndg_httpsclient
+Requires:       python-requests-toolbelt
 Requires:       pyOpenSSL >= 0.13
 %else
 Requires:       python2-ndg_httpsclient
+Requires:       python2-requests-toolbelt
 Requires:       python2-pyOpenSSL >= 0.13
 %endif
 
@@ -117,6 +126,7 @@ Requires: python3-pyOpenSSL
 Requires: python3-pyrfc3339
 Requires: python3-pytz
 Requires: python3-requests
+Requires: python3-requests-toolbelt
 Requires: python3-six
 Requires: python3-josepy
 #Recommends: python-acme-doc
@@ -208,6 +218,9 @@ ln -sf /usr/share/fonts/fontawesome/fontawesome-webfont.woff docs/_build/html/_s
 %endif
 
 %changelog
+* Thu Jun 07 2018 Eli Young <elyscape@gmail.com> - 0.25.0-1
+- Update to 0.25.0 (#1588214)
+
 * Wed May 02 2018 Eli Young <elyscape@gmail.com> - 0.24.0-1
 - Update to 0.24.0 (#1574138)
 - Remove unnecessary build dependencies and patches
diff --git a/sources b/sources
index 6837868..80a0ee0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acme-0.24.0.tar.gz) = 6aad6ed37f7dbdc57c4a05808000c3350056bb2fb8a7c7376b8918d7d642bfb31121f2c597519b20718b943a0ffc26b41e58737c3b2f56951ff836c8a6c00daf
+SHA512 (acme-0.25.0.tar.gz) = d997bc4b604b1ceab6d437500ca8bf3010365da82a3a6328c6ceb357a9753d4c80ce2c2bad49c7c65af2724dd04896c5c6d5c210b2dc16bf82797ef949116108