gentoo resync : 23.06.2018

4 files changed, 33 insertions, 3 deletions

diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 01f0690135ef..a45710cf744c 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,7 +1,8 @@
+AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
 DIST vcrpy-1.10.3.tar.gz 61804 BLAKE2B 58ef423cb7a7c059cf7dc863565420be6829e6b692becfcf8a38b94121265aab832d77deb04cd1c3a622df7bd9bdf1540fc74f63c0f3f85373536cd35c23a01e SHA512 976f3d9b58025ab5c3a8a666138fbbadccaf8612edea63ac4fbf307d55888eb688bf27dd0f24b0d2c5528c951ced533a52cf13c33bfb32d7e89f241ff508018d
 DIST vcrpy-1.11.1.tar.gz 63122 BLAKE2B da0fabb1eb342eb268923bcf433ac108d06fc111714834e99d9364358064ad0814bff1463f49bea60c59fe901c46fc8b78c4129e9bb4ab6736266f18b3bdf272 SHA512 d883b87d5b3017843dfc2e33241953ada27d50ffda4936ba4326a392acb9c7667474abd054d6e44b0208096cd96b68e87ec9780c0d6fab77369cc4e517617395
 DIST vcrpy-1.12.0.tar.gz 326731 BLAKE2B a0fd5aa3fea1bef336f0864a6d89e7025d2394f89af23ac9a3ed61430c85b9a46584c528398a03debcce646767bd85328360513476bc89ca067e705767fe85fd SHA512 c47d50cd399fa11eb6fd1d210b056ef9768e501799a9774f7338370177754e35b9a9ee43ff5cb7f1f43073624f9011cc1ca230dbdf317c1bccd0ec6b506c61e0
 EBUILD vcrpy-1.10.3.ebuild 1131 BLAKE2B 76b16313a059e8681e9d04e4aa3ae15e99518edfcb5ea06d866d6fbd663f7bbb407049fe13048cefcf6381e51ae738fff11a3f9fba49d3daa76b742bf1232d07 SHA512 2aa38af73b16d7879e4859a8450f24eeafff37cd4dd3f398614bae09c599d681fcf4ef6a4940bd7f94c5297118a04086312464ac5f5cf5bb295166155bab704f
-EBUILD vcrpy-1.11.1.ebuild 1204 BLAKE2B fe1a220c0593f1dd4e42160437d45dc092a20e4d059a224757f254823de29287dccbf845ef7149cdb16664225a0f39fc506edc04a6a877690c1e75a2b49e8720 SHA512 5990750f936659cd40f62a649266f4e4e6d6087c7e0f1bfb0c0fe21ffc8d25cb90da13f40ea104401a8dcc7c4c2635cfe858b5b49a6cd53b857ab88fdd63297a
-EBUILD vcrpy-1.12.0.ebuild 1206 BLAKE2B d52c13fb9cb9fff6a9ef6e9782521642792bd9e32604e70c0708f14c5de49beb4dd1aba4b05fb753dd00b136c7257763b2e333ec6854862ece7f09d39d403838 SHA512 e03fed919977bf8253ababacb2449d80e595314790c544a4eb1e2ef94e2353f6b6d2146cf265771756e79239a5fc985edb5ee8b365b7a5dd675db8ef82e0d571
+EBUILD vcrpy-1.11.1.ebuild 1263 BLAKE2B 3977e62c5c176a44e0500843c7a3fde8f0cf2e9057a96d6c2bedd5b74723fd36788058ba0c26535cfc77dcb3c8ab621a62a4fa2a66b0ca647b2120f4a18e6e43 SHA512 b6b1567f3eefdd31059ce86d32c44529a7e48b0d3d724ada02c73c90106acf4fbef5be1c1af04d03fa84c274d7e88c05e8baf8a7ccf86d066ee30d61ec72e44a
+EBUILD vcrpy-1.12.0.ebuild 1265 BLAKE2B 2d2ec361dfc2bd896af59e07f5c5bf80f25b74c2ec2d91d636fbc71e20b73a263bca8acd2fee2ffcc6baa1c162fc153ee72cb6571cd559b9a84643821d0f3a9f SHA512 ee5002c6e939217e978b8092ce9df2c78561283e132af0e8c040f1eb941ca5be6a11d36fd947ef480d4d16558a7220c021616592fcf694f4511fc17af3bd9054
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch b/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
new file mode 100644
index 000000000000..a1f00aa77855
--- /dev/null
+++ b/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/unit/test_stubs.py b/tests/unit/test_stubs.py
+index 7eb0684..a4bc7a1 100644
+--- a/tests/unit/test_stubs.py
++++ b/tests/unit/test_stubs.py
+@@ -1,7 +1,7 @@
+ from vcr.stubs import VCRHTTPSConnection
+ from vcr.compat import mock
+ from vcr.cassette import Cassette
+-
++import pytest
+ 
+ class TestVCRConnection(object):
+ 
+@@ -11,6 +11,7 @@ class TestVCRConnection(object):
+         assert vcr_connection.real_connection.ssl_version == 'example_ssl_version'
+ 
+     @mock.patch('vcr.cassette.Cassette.can_play_response_for', return_value=False)
++    @pytest.mark.skip('requires network access')
+     def testing_connect(*args):
+         vcr_connection = VCRHTTPSConnection('www.google.com')
+         vcr_connection.cassette = Cassette('test', record_mode='all')
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index b50e9d02784c..0bc4604553ed 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,6 +36,10 @@ DEPEND="
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/vcrpy-skip-network-tests.patch
+)
+
 python_test() {
 	py.test -vv -x tests/unit || die
 }
diff --git a/dev-python/vcrpy/vcrpy-1.12.0.ebuild b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
index adfcee1807df..2676c4109733 100644
--- a/dev-python/vcrpy/vcrpy-1.12.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
@@ -36,6 +36,10 @@ DEPEND="
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/vcrpy-skip-network-tests.patch
+)
+
 python_test() {
 	py.test -vv -x tests/unit || die
 }