PR#1: Update to 0.44 - rpms/osbs-client

Vadim Rutkovsky • 6 years ago

d6a5c95

.gitignore

file modified

		`@@ -14,3 +14,4 @@`
		`/osbs-client-696505ae4da4898a4e3689ef18e1f6791b04ea09.tar.gz`
		`/osbs-client-ce184c63bf10bb020aa4039765ccd477cd6f6eea.tar.gz`
		`/osbs-client-971a9ec21bc574d38dccbea4333485b5681f0e7d.tar.gz`
		`+ /osbs-client-b62f138e4210215f89697a5f25568b9159d235e9.tar.gz`

osbs-client-fix-has_connection.patch

file added

+46

		`@@ -0,0 +1,46 @@`
		`+ From 02bd08c27f71f108a8beb9d50ef34c79aa5d70f3 Mon Sep 17 00:00:00 2001`
		`+ From: Vadim Rutkovsky <vrutkovs@redhat.com>`
		`+ Date: Wed, 8 Nov 2017 13:26:45 +0100`
		`+ Subject: [PATCH] tests: don't enable retries when checking if connection is`
		`+ available`
		`+`
		`+ ---`
		`+ tests/test_http.py \| 4 ++--`
		`+ tests/test_retries.py \| 4 ++--`
		`+ 2 files changed, 4 insertions(+), 4 deletions(-)`
		`+`
		`+ diff --git a/tests/test_http.py b/tests/test_http.py`
		`+ index 0df7af3..c1eeb17 100644`
		`+ --- a/tests/test_http.py`
		`+ +++ b/tests/test_http.py`
		`+ @@ -33,9 +33,9 @@ def has_connection():`
		`+ return False`
		`+`
		`+ try:`
		`+ - HttpStream("https://httpbin.org/get", "get")`
		`+ + HttpStream("https://httpbin.org/get", "get", retries_enabled=False)`
		`+ return True`
		`+ - except OsbsNetworkException:`
		`+ + except (OsbsNetworkException, requests.exceptions.ConnectionError):`
		`+ return False`
		`+`
		`+`
		`+ diff --git a/tests/test_retries.py b/tests/test_retries.py`
		`+ index a6ba981..31ce567 100644`
		`+ --- a/tests/test_retries.py`
		`+ +++ b/tests/test_retries.py`
		`+ @@ -38,9 +38,9 @@ def has_connection():`
		`+ return False`
		`+`
		`+ try:`
		`+ - HttpStream("https://httpbin.org/get", "get")`
		`+ + HttpStream("https://httpbin.org/get", "get", retries_enabled=False)`
		`+ return True`
		`+ - except OsbsNetworkException:`
		`+ + except (OsbsNetworkException, requests.exceptions.ConnectionError):`
		`+ return False`
		`+`
		`+`
		`+ --`
		`+ 2.14.3`
		`+`

osbs-client.spec

file modified

+14 -2

		`@@ -22,7 +22,7 @@`
		`%global with_check 1`
		`%endif`

		`- %global commit 971a9ec21bc574d38dccbea4333485b5681f0e7d`
		`+ %global commit b62f138e4210215f89697a5f25568b9159d235e9`
		`%global shortcommit %(c=%{commit}; echo ${c:0:7})`
		`# set to 0 to create a normal release`
		`%global postrelease 0`
		`@@ -31,7 +31,7 @@`
		`%global osbs_obsolete_vr 0.14-2`

		`Name: osbs-client`
		`- Version: 0.41`
		`+ Version: 0.44`
		`%if "x%{postrelease}" != "x0"`
		`Release: %{release}.%{postrelease}.git.%{shortcommit}%{?dist}`
		`%else`
		`@@ -44,6 +44,14 @@`
		`URL: https://github.com/projectatomic/osbs-client`
		`Source0: https://github.com/projectatomic/osbs-client/archive/%{commit}/osbs-client-%{commit}.tar.gz`

		`+ # Some tests require access to httpbin.org, but they are incorrectly detecting that there`
		`+ #is no connection available`
		`+ #`
		`+ # Submitted upstream`
		`+ #`
		`+ # https://github.com/projectatomic/osbs-client/pull/706`
		`+ Patch0: osbs-client-fix-has_connection.patch`
		`+`
		`BuildArch: noarch`

		`%if 0%{?with_python3}`
		`@@ -158,6 +166,7 @@`

		`%prep`
		`%setup -qn %{name}-%{commit}`
		`+ %patch0 -p1`

		`# Remove this test, it tries to hit httpbin.org which fails the build in koji`
		`rm -f tests/test_http.py`
		`@@ -221,6 +230,9 @@`
		`%endif # with_python3`

		`%changelog`
		`+ * Wed Nov 8 2017 Vadim Rutkovsky <vrutkovs@redhat.com> - 0.44-1`
		`+ - Update to latest upstream`
		`+`
		`* Thu Aug 24 2017 Adam Miller <maxamillion@gmail.com> - 0.41-1`
		`- Update to latest upstream`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (osbs-client-971a9ec21bc574d38dccbea4333485b5681f0e7d.tar.gz) = eff997373000fa5b5466e6cc6ed72c74cb7954659ebb418ff0d9619238cee30cf07a576cc6e3cc5db993336a0255a07bde3e9343f51abf24e120b229e4a8cf95`
		`+ SHA512 (osbs-client-b62f138e4210215f89697a5f25568b9159d235e9.tar.gz) = 0ffa1e34f53e2ce41525131748420bb22b9ffceaab08e87b7ff1dea15f1b6cb3c0d05eed5c6c8bd1ba5d9a78420c9281921f88df25dc01c504deca6929f23875`