Update to 0.19.1. Fixes rhbz#1944789
This commit is contained in:
parent
80f2108eb9
commit
a13bc3ac47
1
.gitignore
vendored
1
.gitignore
vendored
@ -22,3 +22,4 @@ httplib2-0.4.0.tar.gz
|
||||
/httplib2-0.18.0.tar.gz
|
||||
/httplib2-0.18.1.tar.gz
|
||||
/httplib2-0.19.0.tar.gz
|
||||
/httplib2-0.19.1.tar.gz
|
||||
|
@ -1,73 +0,0 @@
|
||||
diff --git a/requirements-test.txt b/requirements-test.txt
|
||||
index d208a8f..623875e 100644
|
||||
--- a/requirements-test.txt
|
||||
+++ b/requirements-test.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
flake8==3.4.1
|
||||
future==0.16.0
|
||||
-mock==2.0.0
|
||||
+mock==2.0.0;python_version<"3.3"
|
||||
pytest-cov==2.5.1
|
||||
pytest-forked==0.2
|
||||
pytest-randomly==1.2.1
|
||||
diff --git a/tests/test_cacerts_from_env.py b/tests/test_cacerts_from_env.py
|
||||
index cb2bd9f..f04ba0e 100644
|
||||
--- a/tests/test_cacerts_from_env.py
|
||||
+++ b/tests/test_cacerts_from_env.py
|
||||
@@ -1,6 +1,9 @@
|
||||
import os
|
||||
import sys
|
||||
-import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except ImportError:
|
||||
+ import mock
|
||||
import pytest
|
||||
import tempfile
|
||||
import httplib2
|
||||
diff --git a/tests/test_http.py b/tests/test_http.py
|
||||
index f61992c..65bac01 100644
|
||||
--- a/tests/test_http.py
|
||||
+++ b/tests/test_http.py
|
||||
@@ -5,7 +5,10 @@ from __future__ import print_function
|
||||
import email.utils
|
||||
import errno
|
||||
import httplib2
|
||||
-import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except ImportError:
|
||||
+ import mock
|
||||
import os
|
||||
import pytest
|
||||
from six.moves import http_client, urllib
|
||||
diff --git a/tests/test_other.py b/tests/test_other.py
|
||||
index 0f450ab..6b902b9 100644
|
||||
--- a/tests/test_other.py
|
||||
+++ b/tests/test_other.py
|
||||
@@ -1,5 +1,8 @@
|
||||
import httplib2
|
||||
-import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except ImportError:
|
||||
+ import mock
|
||||
import os
|
||||
import pickle
|
||||
import pytest
|
||||
diff --git a/tests/test_proxy.py b/tests/test_proxy.py
|
||||
index edafe01..556b448 100644
|
||||
--- a/tests/test_proxy.py
|
||||
+++ b/tests/test_proxy.py
|
||||
@@ -9,7 +9,10 @@ from __future__ import division
|
||||
from __future__ import print_function
|
||||
|
||||
import httplib2
|
||||
-import mock
|
||||
+try:
|
||||
+ from unittest import mock
|
||||
+except ImportError:
|
||||
+ import mock
|
||||
import os
|
||||
import pytest
|
||||
import socket
|
@ -1,8 +1,8 @@
|
||||
%global srcname httplib2
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 0.19.0
|
||||
Release: 2%{?dist}
|
||||
Version: 0.19.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Comprehensive HTTP client library
|
||||
License: MIT
|
||||
URL: https://pypi.python.org/pypi/httplib2
|
||||
@ -11,10 +11,6 @@ Source: https://github.com/httplib2/httplib2/archive/v%{version}/%{srcna
|
||||
# Patch to use the Fedora ca certs instead of the bundled ones
|
||||
#
|
||||
Patch1: python-%{srcname}.certfile.patch
|
||||
#
|
||||
# Patch to use mock from the standard library, upstream PR#185
|
||||
#
|
||||
Patch2: python-%{srcname}.nomock.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -72,6 +68,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest -k "not test_unknown_server \
|
||||
%{python3_sitelib}/%{srcname}/
|
||||
|
||||
%changelog
|
||||
* Sat Apr 24 2021 Kevin Fenzi <kevin@scrye.com> - 0.19.1-1
|
||||
- Update to 0.19.1. Fixes rhbz#1944789
|
||||
|
||||
* Wed Mar 3 2021 Pavel Cahyna <pcahyna@redhat.com> - 0.19.0-2
|
||||
- Remove unused python3-pytest-cov build dependency
|
||||
- Use mock from the standard library, remove build dependency
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (httplib2-0.19.0.tar.gz) = f929627118e8e443ee80b6dd7eb936fb5fdc4ae3f0b04381fb1bcdd4498be940fa2c307e63b0ca3512732c55ac1c8c6f4b83d6a5ba8bf8ee0aa0a4ebddbf93a2
|
||||
SHA512 (httplib2-0.19.1.tar.gz) = 7059743d9023530abbe1be6010dede9dcf1c329be7ee5b634b38021602cec9334b080de37935250461f88c48443a704b4045017c5352eed459bbc27f4b8468da
|
||||
|
Loading…
Reference in New Issue
Block a user