From ae81d91d2c840bf4e18d3c6509d1693f2e55a63f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 26 2018 15:00:43 +0000 Subject: import python-boto3-1.4.6-4.el7_5.1 --- diff --git a/SOURCES/bundled-botocore-jmespath.patch b/SOURCES/bundled-botocore-jmespath.patch index 2881573..de38642 100644 --- a/SOURCES/bundled-botocore-jmespath.patch +++ b/SOURCES/bundled-botocore-jmespath.patch @@ -1,6 +1,6 @@ diff -uNr a/boto3/compat.py b/boto3/compat.py --- a/boto3/compat.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/compat.py 2018-02-12 16:07:04.150325256 +0100 ++++ b/boto3/compat.py 2018-05-17 09:35:12.624144609 +0200 @@ -15,6 +15,7 @@ import errno import socket @@ -11,7 +11,7 @@ diff -uNr a/boto3/compat.py b/boto3/compat.py if six.PY3: diff -uNr a/boto3/docs/action.py b/boto3/docs/action.py --- a/boto3/docs/action.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/action.py 2018-02-12 16:07:04.150325256 +0100 ++++ b/boto3/docs/action.py 2018-05-17 09:35:12.624144609 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -23,7 +23,7 @@ diff -uNr a/boto3/docs/action.py b/boto3/docs/action.py from botocore.utils import get_service_module_name diff -uNr a/boto3/docs/attr.py b/boto3/docs/attr.py --- a/boto3/docs/attr.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/attr.py 2018-02-12 16:07:04.150325256 +0100 ++++ b/boto3/docs/attr.py 2018-05-17 09:35:12.624144609 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -35,7 +35,7 @@ diff -uNr a/boto3/docs/attr.py b/boto3/docs/attr.py from boto3.docs.utils import get_identifier_description diff -uNr a/boto3/docs/base.py b/boto3/docs/base.py --- a/boto3/docs/base.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/base.py 2018-02-12 16:07:04.151325242 +0100 ++++ b/boto3/docs/base.py 2018-05-17 09:35:12.624144609 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -47,7 +47,7 @@ diff -uNr a/boto3/docs/base.py b/boto3/docs/base.py diff -uNr a/boto3/docs/client.py b/boto3/docs/client.py --- a/boto3/docs/client.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/client.py 2018-02-12 16:07:04.151325242 +0100 ++++ b/boto3/docs/client.py 2018-05-17 09:35:12.625144591 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -59,7 +59,7 @@ diff -uNr a/boto3/docs/client.py b/boto3/docs/client.py diff -uNr a/boto3/docs/collection.py b/boto3/docs/collection.py --- a/boto3/docs/collection.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/collection.py 2018-02-12 16:07:04.151325242 +0100 ++++ b/boto3/docs/collection.py 2018-05-17 09:35:12.625144591 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -71,7 +71,7 @@ diff -uNr a/boto3/docs/collection.py b/boto3/docs/collection.py from botocore.docs.utils import DocumentedShape diff -uNr a/boto3/docs/docstring.py b/boto3/docs/docstring.py --- a/boto3/docs/docstring.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/docstring.py 2018-02-12 16:07:04.152325229 +0100 ++++ b/boto3/docs/docstring.py 2018-05-17 09:35:12.625144591 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -83,7 +83,7 @@ diff -uNr a/boto3/docs/docstring.py b/boto3/docs/docstring.py from boto3.docs.action import document_action diff -uNr a/boto3/docs/method.py b/boto3/docs/method.py --- a/boto3/docs/method.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/method.py 2018-02-12 16:07:04.152325229 +0100 ++++ b/boto3/docs/method.py 2018-05-17 09:35:12.625144591 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -95,7 +95,7 @@ diff -uNr a/boto3/docs/method.py b/boto3/docs/method.py diff -uNr a/boto3/docs/resource.py b/boto3/docs/resource.py --- a/boto3/docs/resource.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/resource.py 2018-02-12 16:07:04.152325229 +0100 ++++ b/boto3/docs/resource.py 2018-05-17 09:35:12.625144591 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -107,7 +107,7 @@ diff -uNr a/boto3/docs/resource.py b/boto3/docs/resource.py diff -uNr a/boto3/docs/service.py b/boto3/docs/service.py --- a/boto3/docs/service.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/service.py 2018-02-12 16:07:04.152325229 +0100 ++++ b/boto3/docs/service.py 2018-05-17 09:35:12.625144591 +0200 @@ -13,6 +13,8 @@ import os @@ -119,7 +119,7 @@ diff -uNr a/boto3/docs/service.py b/boto3/docs/service.py from botocore.docs.bcdoc.restdoc import DocumentStructure diff -uNr a/boto3/docs/subresource.py b/boto3/docs/subresource.py --- a/boto3/docs/subresource.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/subresource.py 2018-02-12 16:07:04.153325215 +0100 ++++ b/boto3/docs/subresource.py 2018-05-17 09:35:12.625144591 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -131,7 +131,7 @@ diff -uNr a/boto3/docs/subresource.py b/boto3/docs/subresource.py diff -uNr a/boto3/docs/utils.py b/boto3/docs/utils.py --- a/boto3/docs/utils.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/utils.py 2018-02-12 16:09:30.631298110 +0100 ++++ b/boto3/docs/utils.py 2018-05-17 09:35:12.626144574 +0200 @@ -12,6 +12,8 @@ # language governing permissions and limitations under the License. import inspect @@ -143,7 +143,7 @@ diff -uNr a/boto3/docs/utils.py b/boto3/docs/utils.py from botocore.compat import six diff -uNr a/boto3/docs/waiter.py b/boto3/docs/waiter.py --- a/boto3/docs/waiter.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/docs/waiter.py 2018-02-12 16:07:04.153325215 +0100 ++++ b/boto3/docs/waiter.py 2018-05-17 09:35:12.626144574 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -155,7 +155,7 @@ diff -uNr a/boto3/docs/waiter.py b/boto3/docs/waiter.py from botocore.docs.method import document_model_driven_method diff -uNr a/boto3/dynamodb/types.py b/boto3/dynamodb/types.py --- a/boto3/dynamodb/types.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/dynamodb/types.py 2018-02-12 16:07:04.154325201 +0100 ++++ b/boto3/dynamodb/types.py 2018-05-17 09:35:12.626144574 +0200 @@ -14,6 +14,8 @@ from decimal import Decimal, Context, Clamped from decimal import Overflow, Inexact, Underflow, Rounded @@ -167,7 +167,7 @@ diff -uNr a/boto3/dynamodb/types.py b/boto3/dynamodb/types.py diff -uNr a/boto3/exceptions.py b/boto3/exceptions.py --- a/boto3/exceptions.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/exceptions.py 2018-02-12 16:07:04.154325201 +0100 ++++ b/boto3/exceptions.py 2018-05-17 09:35:12.626144574 +0200 @@ -12,6 +12,8 @@ # language governing permissions and limitations under the License. @@ -179,7 +179,7 @@ diff -uNr a/boto3/exceptions.py b/boto3/exceptions.py diff -uNr a/boto3/resources/action.py b/boto3/resources/action.py --- a/boto3/resources/action.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/resources/action.py 2018-02-12 16:07:04.154325201 +0100 ++++ b/boto3/resources/action.py 2018-05-17 09:35:12.626144574 +0200 @@ -13,6 +13,8 @@ import logging @@ -191,7 +191,7 @@ diff -uNr a/boto3/resources/action.py b/boto3/resources/action.py from .params import create_request_parameters diff -uNr a/boto3/resources/collection.py b/boto3/resources/collection.py --- a/boto3/resources/collection.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/resources/collection.py 2018-02-12 16:07:04.155325187 +0100 ++++ b/boto3/resources/collection.py 2018-05-17 09:35:12.626144574 +0200 @@ -14,6 +14,8 @@ import copy import logging @@ -203,7 +203,7 @@ diff -uNr a/boto3/resources/collection.py b/boto3/resources/collection.py diff -uNr a/boto3/resources/model.py b/boto3/resources/model.py --- a/boto3/resources/model.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/resources/model.py 2018-02-12 16:07:04.155325187 +0100 ++++ b/boto3/resources/model.py 2018-05-17 09:35:12.627144557 +0200 @@ -25,6 +25,8 @@ import logging @@ -215,7 +215,7 @@ diff -uNr a/boto3/resources/model.py b/boto3/resources/model.py diff -uNr a/boto3/resources/params.py b/boto3/resources/params.py --- a/boto3/resources/params.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/resources/params.py 2018-02-12 16:09:21.232428180 +0100 ++++ b/boto3/resources/params.py 2018-05-17 09:35:12.627144557 +0200 @@ -13,6 +13,8 @@ import re @@ -227,7 +227,7 @@ diff -uNr a/boto3/resources/params.py b/boto3/resources/params.py diff -uNr a/boto3/resources/response.py b/boto3/resources/response.py --- a/boto3/resources/response.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/resources/response.py 2018-02-12 16:09:10.607575218 +0100 ++++ b/boto3/resources/response.py 2018-05-17 09:35:12.627144557 +0200 @@ -11,6 +11,8 @@ # ANY KIND, either express or implied. See the License for the specific # language governing permissions and limitations under the License. @@ -239,7 +239,7 @@ diff -uNr a/boto3/resources/response.py b/boto3/resources/response.py diff -uNr a/boto3/s3/inject.py b/boto3/s3/inject.py --- a/boto3/s3/inject.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/s3/inject.py 2018-02-12 16:07:04.156325173 +0100 ++++ b/boto3/s3/inject.py 2018-05-17 09:35:12.627144557 +0200 @@ -10,6 +10,8 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific @@ -251,18 +251,19 @@ diff -uNr a/boto3/s3/inject.py b/boto3/s3/inject.py from boto3.s3.transfer import create_transfer_manager diff -uNr a/boto3/s3/transfer.py b/boto3/s3/transfer.py --- a/boto3/s3/transfer.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/s3/transfer.py 2018-02-12 16:07:04.156325173 +0100 -@@ -122,6 +122,7 @@ ++++ b/boto3/s3/transfer.py 2018-05-17 09:38:14.359063098 +0200 +@@ -122,6 +122,8 @@ """ ++import sys +sys.path.insert(0, '/usr/lib/fence-agents/bundled') from botocore.exceptions import ClientError from botocore.compat import six from s3transfer.exceptions import RetriesExceededError as \ diff -uNr a/boto3/session.py b/boto3/session.py --- a/boto3/session.py 2017-08-12 01:38:50.000000000 +0200 -+++ b/boto3/session.py 2018-02-12 16:07:04.156325173 +0100 ++++ b/boto3/session.py 2018-05-17 09:35:12.627144557 +0200 @@ -14,6 +14,8 @@ import copy import os diff --git a/SPECS/python-boto3.spec b/SPECS/python-boto3.spec index d9bc72f..69cca8c 100644 --- a/SPECS/python-boto3.spec +++ b/SPECS/python-boto3.spec @@ -11,7 +11,7 @@ Name: python-%{pypi_name} Version: 1.4.6 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: The AWS SDK for Python License: ASL 2.0 @@ -113,6 +113,11 @@ rm -rf tests/integration %endif # with python3 %changelog +* Thu May 24 2018 Oyvind Albrigtsen - 1.4.6-4.1 +- Fix missing "import sys" in s3/transfer.py + + Resolves: rhbz#1581764 + * Mon Feb 12 2018 Oyvind Albrigtsen - 1.4.6-4 - Append python-botocore and python-jmespath bundled directories to search path where needed