From 0415fe20e43392d0fae4572cfa8bd44f396a625f8905b44f91ef2fc1652de4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 9 Mar 2019 09:48:53 +0000 Subject: [PATCH] Accepting request 682992 from home:jayvdb:py-check-failures - Fix removal of tests from runtime package - Run tests on both Python 2 and 3 - Use documented method of disabling network unit tests - Remove no longer needed wsgi_intercept-disable-testbogusdomain.patch - Add fdupes - Update to v1.8.0 * Add wheel support - from v1.7.0 * Allow nested interceptor context managers - from v1.6.0 * set wsgi.errors to sys.stderr - from v1.5.1 * Use fewer dependencies when building docs * Ignore `socket_options` for urllib3 OBS-URL: https://build.opensuse.org/request/show/682992 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-wsgi_intercept?expand=0&rev=36 --- python-wsgi_intercept.changes | 18 ++++++++++++++++++ python-wsgi_intercept.spec | 16 +++++++--------- wsgi_intercept-1.5.0.tar.gz | 3 --- wsgi_intercept-1.8.0.tar.gz | 3 +++ wsgi_intercept-disable-testbogusdomain.patch | 16 ---------------- 5 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 wsgi_intercept-1.5.0.tar.gz create mode 100644 wsgi_intercept-1.8.0.tar.gz delete mode 100644 wsgi_intercept-disable-testbogusdomain.patch diff --git a/python-wsgi_intercept.changes b/python-wsgi_intercept.changes index 2ac2b2f..430b389 100644 --- a/python-wsgi_intercept.changes +++ b/python-wsgi_intercept.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sat Mar 9 09:12:17 UTC 2019 - John Vandenberg + +- Fix removal of tests from runtime package +- Run tests on both Python 2 and 3 +- Use documented method of disabling network unit tests +- Remove no longer needed wsgi_intercept-disable-testbogusdomain.patch +- Add fdupes +- Update to v1.8.0 + * Add wheel support +- from v1.7.0 + * Allow nested interceptor context managers +- from v1.6.0 + * set wsgi.errors to sys.stderr +- from v1.5.1 + * Use fewer dependencies when building docs + * Ignore `socket_options` for urllib3 + ------------------------------------------------------------------- Thu Jan 10 22:45:48 UTC 2019 - Jonathan Brownell diff --git a/python-wsgi_intercept.spec b/python-wsgi_intercept.spec index b08c117..2a222dc 100644 --- a/python-wsgi_intercept.spec +++ b/python-wsgi_intercept.spec @@ -1,7 +1,7 @@ # # spec file for package python-wsgi_intercept # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-wsgi_intercept -Version: 1.5.0 +Version: 1.8.0 Release: 0 Summary: Installs a WSGI application in place of a real URI for testing License: MIT Group: Development/Languages/Python Url: https://github.com/cdent/python3-wsgi-intercept Source: https://pypi.io/packages/source/w/wsgi_intercept/wsgi_intercept-%{version}.tar.gz -# PATCH-FIX-OPENSUSE speilicke@suse.com -- Patching fails -Patch0: wsgi_intercept-disable-testbogusdomain.patch BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros # Test requirements: @@ -35,13 +33,13 @@ BuildRequires: %{python_module pytest >= 2.4} BuildRequires: %{python_module requests >= 2.0.1} BuildRequires: %{python_module six} BuildRequires: %{python_module urllib3 >= 1.11.0} +BuildRequires: fdupes Requires: python-six %if 0%{?_no_weakdeps} Requires: python-requests >= 2.0.1 %else Recommends: python-requests >= 2.0.1 %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -64,14 +62,14 @@ can avoid spawning multiple processes or threads to test your Web app. %install %python_install -rm -rf %{buildroot}%{python_sitelib}/test +rm -r %{buildroot}%{python_sitelib}/wsgi_intercept/tests +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# skip tests trying to access google.com -py.test -k "not not_intercepted" build/ +export WSGI_INTERCEPT_SKIP_NETWORK=true +%python_exec -m pytest --ignore _build.python2 --ignore _build.python3 %files %{python_files} -%defattr(-,root,root,-) %{python_sitelib}/wsgi_intercept-%{version}-py%{py_ver}.egg-info %{python_sitelib}/wsgi_intercept diff --git a/wsgi_intercept-1.5.0.tar.gz b/wsgi_intercept-1.5.0.tar.gz deleted file mode 100644 index d96d12c..0000000 --- a/wsgi_intercept-1.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ada141cff264edc5e90b1f8894b2e87e6a2c12214bba0d3c3c6dd311ae42b359 -size 26679 diff --git a/wsgi_intercept-1.8.0.tar.gz b/wsgi_intercept-1.8.0.tar.gz new file mode 100644 index 0000000..5e91713 --- /dev/null +++ b/wsgi_intercept-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a0a91e0da8ea71cbc3cf3fb81dfdc0012958136e2407c94906c8139bb24cc86 +size 26919 diff --git a/wsgi_intercept-disable-testbogusdomain.patch b/wsgi_intercept-disable-testbogusdomain.patch deleted file mode 100644 index c9e7737..0000000 --- a/wsgi_intercept-disable-testbogusdomain.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- wsgi_intercept-0.10.0.orig/test/test_httplib2.py -+++ wsgi_intercept-0.10.0/test/test_httplib2.py -@@ -40,13 +40,6 @@ def test_http_other_port(): - assert environ['wsgi.url_scheme'] == 'http' - - --def test_bogus_domain(): -- with InstalledApp(wsgi_app.simple_app, host=HOST, port=80): -- py.test.raises( -- gaierror, -- 'httplib2_intercept.HTTP_WSGIInterceptorWithTimeout("_nonexistant_domain_").connect()') -- -- - def test_https(): - with InstalledApp(wsgi_app.simple_app, host=HOST, port=443) as app: - http = httplib2.Http()