Compare commits

..

No commits in common. "master" and "upstream" have entirely different histories.

15 changed files with 0 additions and 627 deletions

405
debian/changelog vendored
View file

@ -1,405 +0,0 @@
python-botocore (1.29.27+repack-1~bpo11+1~evo) bullseye-backports; urgency=medium
* Rebuild for bullseye-backports.
-- David Prévot <taffit@debian.org> Tue, 07 Feb 2023 09:20:14 +0100
python-botocore (1.29.27+repack-1) unstable; urgency=medium
* New upstream version 1.29.27+repack
* Refresh patch 0001-Don-t-use-duplicated-modules.patch
-- Noah Meyerhans <noahm@debian.org> Mon, 12 Dec 2022 08:47:32 -0800
python-botocore (1.26.8+repack-1) unstable; urgency=medium
* New upstream version 1.26.8+repack
* Refresh patches
-- Noah Meyerhans <noahm@debian.org> Wed, 25 May 2022 16:51:30 -0700
python-botocore (1.23.34+repack-1) unstable; urgency=medium
* New upstream version 1.23.34+repack
-- Noah Meyerhans <noahm@debian.org> Wed, 12 Jan 2022 14:46:49 -0800
python-botocore (1.22.9+repack-1) unstable; urgency=medium
* New upstream version 1.22.9+repack
* Fix python build dependency (Closes: 998397)
* Refresh patch 0001-Don-t-use-duplicated-modules.patch
-- Noah Meyerhans <noahm@debian.org> Wed, 03 Nov 2021 10:21:57 -0700
python-botocore (1.21.53+repack-1) unstable; urgency=medium
* New upstream version 1.21.53+repack
* Refresh debian/patches/0001-Don-t-use-duplicated-modules.patch
* Refresh python3 build-deps per lintian
* Install NOTICE file
-- Noah Meyerhans <noahm@debian.org> Mon, 04 Oct 2021 10:01:37 -0700
python-botocore (1.21.46+repack-1) unstable; urgency=medium
* d/control: Update vcs links
* New upstream version 1.21.46+repack
* Bump standards version to 4.6.0
* refresh patches
-- Noah Meyerhans <noahm@debian.org> Wed, 22 Sep 2021 14:05:55 -0700
python-botocore (1.21.23+repack-1) unstable; urgency=medium
* New upstream version 1.21.23+repack
* Refresh patches
-- Noah Meyerhans <noahm@debian.org> Wed, 18 Aug 2021 09:26:06 -0700
python-botocore (1.20.0+repack-1) unstable; urgency=medium
* strip shortbreadv1.js from upstream source
* New upstream version 1.20.0+repack
-- Noah Meyerhans <noahm@debian.org> Tue, 02 Feb 2021 14:51:44 -0800
python-botocore (1.19.63+repack-1) unstable; urgency=medium
* New upstream version 1.19.59+repack
* Note Breaks relationship with older awscli packages due to upstream
refactor in which a component previously included in botocore was
moved to awscli
-- Noah Meyerhans <noahm@debian.org> Sat, 30 Jan 2021 10:18:35 -0800
python-botocore (1.17.22+repack-1) unstable; urgency=medium
* New upstream version (Closes: #965092)
-- Noah Meyerhans <noahm@debian.org> Thu, 16 Jul 2020 14:52:31 -0700
python-botocore (1.17.9+repack-1) unstable; urgency=medium
* New upstream version 1.17.9+repack
* Change Maintainer to Debian Cloud Team as discussed at
https://lists.debian.org/debian-cloud/2020/06/msg00078.html and add myself
to Uploaders
-- Noah Meyerhans <noahm@debian.org> Tue, 23 Jun 2020 17:24:40 -0700
python-botocore (1.16.19+repack-1) unstable; urgency=medium
* New upstream version 1.16.19+repack
-- TANIGUCHI Takaki <takaki@debian.org> Sat, 30 May 2020 19:51:09 +0900
python-botocore (1.15.46+repack-1) unstable; urgency=medium
* New upstream version 1.15.46+repack
-- TANIGUCHI Takaki <takaki@debian.org> Sat, 25 Apr 2020 13:13:19 +0900
python-botocore (1.15.26+repack-1) unstable; urgency=medium
* New upstream version 1.15.26+repack
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 22 Mar 2020 21:15:56 +0900
python-botocore (1.15.21+repack-1) unstable; urgency=medium
* New upstream version 1.15.21+repack
* Refresh patch 0001-Don-t-use-duplicated-modules.patch
-- Noah Meyerhans <noahm@debian.org> Mon, 16 Mar 2020 17:17:57 -0700
python-botocore (1.14.14+repack-1) unstable; urgency=medium
* New upstream version 1.14.14+repack
* Set upstream metadata fields: Bug-Database, Bug-Submit.
* Bump Standards-Version to 4.5.0
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 12 Feb 2020 10:44:30 +0900
python-botocore (1.13.37+repack-1) unstable; urgency=medium
* Set upstream metadata fields: Repository, Repository-Browse.
* New upstream version 1.13.37+repack
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 12 Dec 2019 18:27:46 +0900
python-botocore (1.13.19+repack-1) unstable; urgency=medium
* New upstream version 1.13.19+repack
-- TANIGUCHI Takaki <takaki@debian.org> Mon, 18 Nov 2019 17:55:48 +0900
python-botocore (1.12.241+repack-2) unstable; urgency=medium
[ Ondřej Nový ]
* Bump Standards-Version to 4.4.1.
* d/changelog: Remove trailing whitespaces.
[ Sandro Tosi ]
* Drop python2 support; Closes: #937619
-- Sandro Tosi <morph@debian.org> Sat, 26 Oct 2019 20:43:46 -0400
python-botocore (1.12.241+repack-1) unstable; urgency=medium
* New upstream version 1.12.241+repack
* Set upstream metadata fields: Repository.
* Add debian/salsa-ci.yml.
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 03 Oct 2019 20:20:03 +0900
python-botocore (1.12.208+repack-1) unstable; urgency=medium
* New upstream version 1.12.208+repack
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 15 Aug 2019 17:36:19 +0900
python-botocore (1.12.200+repack-1) unstable; urgency=medium
* New upstream version 1.12.200+repack
* Use debhelper-compat instead of debian/compat.
* Bump Standards-Version to 4.4.0.
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 04 Aug 2019 00:51:02 +0900
python-botocore (1.12.103+repack-1) unstable; urgency=medium
* New upstream version 1.12.103+repack
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 27 Feb 2019 16:32:50 +0900
python-botocore (1.12.71+repack-1) unstable; urgency=medium
* New upstream version 1.12.71+repack
* Bump Stanrads-Version to 4.3.0
-- TANIGUCHI Takaki <takaki@debian.org> Fri, 28 Dec 2018 16:08:55 +0900
python-botocore (1.12.53+repack-1) unstable; urgency=medium
* New upstream version 1.12.53+repack
* debian/patches/*: Refresh patches.
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 28 Nov 2018 18:51:54 +0900
python-botocore (1.12.16+repack-1) unstable; urgency=medium
* New upstream version 1.12.16+repack
* debian/patches: Refresh patch files.
* Bump Stanrads-Version to 4.2.1
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 04 Oct 2018 17:45:35 +0900
python-botocore (1.10.78+repack-1) unstable; urgency=medium
[ Ondřej Nový ]
* Convert git repository from git-dpm to gbp layout
[ TANIGUCHI Takaki ]
* New upstream version 1.10.78+repack
* Bump Stanrads-Version to 4.2.0.1
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 16 Aug 2018 15:04:16 +0900
python-botocore (1.10.55+repack-1) unstable; urgency=medium
* Team upload.
[ Ondřej Nový ]
* d/control: Bump required version of python-requests to 2.7.0
(Thanks to Jan Kriho for report)
[ Alexander Gerasiov ]
* New upstream version 1.10.55+repack
* d/patches: Refreshed.
-- Alexander Gerasiov <gerasiov@yandex-team.ru> Wed, 11 Jul 2018 09:31:43 +0300
python-botocore (1.10.15+repack-1) unstable; urgency=medium
[ Ondřej Nový ]
* d/copyright: Use https protocol in Format field
* d/watch: Use https protocol
* d/changelog: Remove trailing whitespaces
[ TANIGUCHI Takaki ]
* New upstream version 1.10.15+repack
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 08 May 2018 11:04:31 +0900
python-botocore (1.8.48+repack-1) unstable; urgency=medium
* New upstream version 1.8.48+repack
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 22 Feb 2018 17:46:12 +0900
python-botocore (1.8.40+repack-1) unstable; urgency=medium
* New upstream version 1.8.40+repack
* Migrate Vcs-* to salsa.debian.org.
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 11 Feb 2018 17:58:05 +0900
python-botocore (1.8.36+repack-1) unstable; urgency=medium
* New upstream version 1.8.36+repack
* debian/compat: 11
-- TANIGUCHI Takaki <takaki@debian.org> Sat, 03 Feb 2018 18:39:19 +0900
python-botocore (1.8.28+repack-1) unstable; urgency=medium
[ Andreas Tille ]
* New upstream version
* Standards-Version: 4.1.3
-- TANIGUCHI Takaki <takaki@debian.org> Sat, 20 Jan 2018 17:11:12 +0900
python-botocore (1.6.6-1) unstable; urgency=medium
* New upstream version 1.6.6
* debian/patches: Add ssl_context patch (Closes: #854382)
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 24 Aug 2017 11:46:29 +0900
python-botocore (1.5.84-1) unstable; urgency=medium
* New upstream version 1.5.84
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 19 Jul 2017 18:47:08 +0900
python-botocore (1.5.80-1) unstable; urgency=medium
* New upstream version 1.5.80
* debian/compat: Bump to 10
-- TANIGUCHI Takaki <takaki@debian.org> Mon, 10 Jul 2017 16:41:24 +0900
python-botocore (1.5.78-1) unstable; urgency=medium
* New upstream version 1.5.78
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 04 Jul 2017 15:36:40 +0900
python-botocore (1.5.75-2) unstable; urgency=medium
* debian/patches: Fix errors. (Closes: #866163)
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 28 Jun 2017 11:19:03 +0900
python-botocore (1.5.75-1) unstable; urgency=medium
* New upstream version 1.5.75
* Bump Standards-Version to 4.0.0 (without changes)
* debian/patches: refresh patches
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 27 Jun 2017 19:01:59 +0900
python-botocore (1.5.7-1) unstable; urgency=medium
* New upstream version 1.5.7
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 02 Feb 2017 17:37:30 +0900
python-botocore (1.4.70-1) unstable; urgency=medium
* New upstream version 1.4.70
* debian/patches: Refresh patches.
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 10 Nov 2016 11:34:51 +0900
python-botocore (1.4.64-1) unstable; urgency=medium
[ Ondřej Nový ]
* Fixed VCS URL (https)
[ TANIGUCHI Takaki ]
* New upstream version 1.4.64
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 20 Oct 2016 16:19:16 +0900
python-botocore (1.4.60-1) unstable; urgency=medium
* New upstream release (Closes: #833014)
* Bump Standards-Version to 3.9.8 (no changes).
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 11 Oct 2016 10:11:03 +0900
python-botocore (1.3.23-1) unstable; urgency=medium
* Import python-botocore_1.3.23.orig.tar.gz (Closes: #798015)
* debian/patches: Fix improt package path. (Closes: #806761)
* debian/copyright: Change to Apache-2.0. (Closes: #812317)
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 02 Feb 2016 18:05:47 +0900
python-botocore (1.3.9-1) unstable; urgency=medium
* new upstream version
* Refresh debian patche.
* debian/control: Add python-mock to B-D.
* debian/rules: Skipt test. (It requires AWS credential(?).)
* debian/watch: Replace pypi.debian.net.
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 25 Nov 2015 00:14:28 +0900
python-botocore (0.81.0-1) unstable; urgency=medium
* New upstream release
* Refresh patch. (Closes: #769685)
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 13 Jan 2015 23:06:39 +0900
python-botocore (0.69.0-1) unstable; urgency=medium
* New upstream release
* debian/pathces: refresh
* Bump Standards-Version to 3.9.6 (no changes).
* Add dh-python to B-D.
-- TANIGUCHI Takaki <takaki@debian.org> Wed, 05 Nov 2014 10:04:37 +0900
python-botocore (0.62.0-1) unstable; urgency=medium
* New upstream release
* debian/patches: refresh
-- TANIGUCHI Takaki <takaki@debian.org> Thu, 04 Sep 2014 11:59:09 +0900
python-botocore (0.55.0-1) unstable; urgency=medium
* New upstream release
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 06 Jul 2014 17:52:40 +0900
python-botocore (0.52.0-1) unstable; urgency=medium
* New upstream release
* debian/control: use Files-Excluded to remove duplicate code.
* debian/rules: revice python3 building.
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 22 Jun 2014 19:39:36 +0900
python-botocore (0.29.0+repack-2) unstable; urgency=medium
* debian/watch: Add debian version mangle.
* debian/control: Add python-requests to Depends. (Closes: #734382)
-- TANIGUCHI Takaki <takaki@debian.org> Tue, 04 Feb 2014 18:28:43 +0900
python-botocore (0.29.0+repack-1) unstable; urgency=medium
* Remove duplicated code from upstream tarball.
-- TANIGUCHI Takaki <takaki@debian.org> Sun, 05 Jan 2014 23:02:56 +0900
python-botocore (0.29.0-1) unstable; urgency=low
* Initial release (Closes: #733214)
-- TANIGUCHI Takaki <takaki@debian.org> Fri, 27 Dec 2013 16:45:14 +0900

1
debian/clean vendored
View file

@ -1 +0,0 @@
*.egg-info/*

25
debian/control vendored
View file

@ -1,25 +0,0 @@
Source: python-botocore
Section: python
Priority: optional
Maintainer: Debian Cloud Team <debian-cloud@lists.debian.org>
Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
Noah Meyerhans <noahm@debian.org>
Build-Depends: debhelper-compat (= 12)
, python3-all:any
, python3-setuptools
, python3-mock
, dh-python
Standards-Version: 4.6.0
Homepage: https://github.com/boto/botocore
Vcs-Git: https://salsa.debian.org/cloud-team/python-botocore.git
Vcs-Browser: https://salsa.debian.org/cloud-team/python-botocore
Package: python3-botocore
Architecture: all
Depends: ${python3:Depends}, python3-requests, ${misc:Depends}
Breaks: awscli (<< 1.18.140)
Description: Low-level, data-driven core of boto 3 (Python 3)
A low-level interface to a growing number of Amazon Web Services.
The botocore package is the foundation for AWS-CLI.
.
This package contains the module for Python 3.

31
debian/copyright vendored
View file

@ -1,31 +0,0 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: python-botocore
Source: https://pypi.python.org/pypi/botocore
Files-Excluded:
botocore/vendored
botocore.egg-info
docs/source/_static/shortbreadv1.js
Files: *
Copyright: Mitch Garnaat <garnaat@amazon.com>
License: Apache-2.0
Files: debian/*
Copyright: 2013 TANIGUCHI Takaki <takaki@debian.org>
License: Apache-2.0
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
http://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian systems, the complete text of the Apache version 2.0 license
can be found in "/usr/share/common-licenses/Apache-2.0".

3
debian/docs vendored
View file

@ -1,3 +0,0 @@
README.rst
requirements.txt
NOTICE

2
debian/gbp.conf vendored
View file

@ -1,2 +0,0 @@
[DEFAULT]
pristine-tar = True

View file

@ -1,97 +0,0 @@
From: TANIGUCHI Takaki <takaki@asis.media-as.org>
Date: Thu, 4 Oct 2018 16:22:43 +0900
Subject: Don't use duplicated modules
---
botocore/compat.py | 4 ++--
botocore/endpoint.py | 2 +-
botocore/exceptions.py | 4 ++--
botocore/httpsession.py | 4 ++--
botocore/utils.py | 2 +-
tests/functional/test_six_threading.py | 4 ++--
tests/integration/test_client_http.py | 4 ++--
tests/integration/test_glacier.py | 2 +-
tests/integration/test_s3.py | 2 +-
tests/unit/test_endpoint.py | 2 +-
tests/unit/test_http_client_exception_mapping.py | 4 ++--
tests/unit/test_http_session.py | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
Index: python-botocore/botocore/compat.py
===================================================================
--- python-botocore.orig/botocore/compat.py
+++ python-botocore/botocore/compat.py
@@ -26,7 +26,7 @@ from collections import OrderedDict
from collections.abc import MutableMapping
from math import floor
-from botocore.vendored import six
+import six
from botocore.exceptions import MD5UnavailableError
from dateutil.tz import tzlocal
from urllib3 import exceptions
Index: python-botocore/botocore/exceptions.py
===================================================================
--- python-botocore.orig/botocore/exceptions.py
+++ python-botocore/botocore/exceptions.py
@@ -12,8 +12,8 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
-from botocore.vendored import requests
-from botocore.vendored.requests.packages import urllib3
+import requests
+from requests.packages import urllib3
def _exception_from_packed_args(exception_cls, args=None, kwargs=None):
Index: python-botocore/tests/functional/test_six_threading.py
===================================================================
--- python-botocore.orig/tests/functional/test_six_threading.py
+++ python-botocore/tests/functional/test_six_threading.py
@@ -5,7 +5,7 @@ import sys
import threading
import time
-from botocore.vendored import six
+import six
from tests import mock
_original_setattr = six.moves.__class__.__setattr__
@@ -46,7 +46,7 @@ class _ExampleThread(threading.Thread):
def test_six_thread_safety():
_reload_six()
with mock.patch(
- 'botocore.vendored.six.moves.__class__.__setattr__',
+ 'six.moves.__class__.__setattr__',
wraps=_wrapped_setattr,
):
threads = []
Index: python-botocore/tests/integration/test_client_http.py
===================================================================
--- python-botocore.orig/tests/integration/test_client_http.py
+++ python-botocore/tests/integration/test_client_http.py
@@ -16,7 +16,7 @@ from botocore.exceptions import (
ProxyConnectionError,
ReadTimeoutError,
)
-from botocore.vendored.requests import exceptions as requests_exceptions
+from requests import exceptions as requests_exceptions
from tests import mock, unittest
Index: python-botocore/tests/unit/test_http_client_exception_mapping.py
===================================================================
--- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py
+++ python-botocore/tests/unit/test_http_client_exception_mapping.py
@@ -1,8 +1,8 @@
import pytest
from botocore import exceptions as botocore_exceptions
-from botocore.vendored.requests import exceptions as requests_exceptions
-from botocore.vendored.requests.packages.urllib3 import (
+from requests import exceptions as requests_exceptions
+from requests.packages.urllib3 import (
exceptions as urllib3_exceptions,
)

View file

@ -1,2 +0,0 @@
0001-Don-t-use-duplicated-modules.patch
strip-shortbread-js

View file

@ -1,33 +0,0 @@
Description: strip shortbreadv1.js from source tarball
shortbreadv1.js is distributed as minimized javascript with no
copyright or license information and no links to the original
source. So we remove it from the orig tarball and remove references
to it from the rest of the package contents.
.
The javascript in quesetion is related to interactive questions about
affermative cookie consent as required by GDPR and other
regulations. Since we are not building HTML docs at all as part of
this package, removing this file has no material impact on the
packages we build.
Author: Noah Meyerhans <noahm@debian.org>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: python-botocore/docs/source/_templates/layout.html
===================================================================
--- python-botocore.orig/docs/source/_templates/layout.html
+++ python-botocore/docs/source/_templates/layout.html
@@ -10,13 +10,6 @@
<div class="footer">
- <script type="text/javascript" src="{{ pathto('_static/shortbreadv1.js',1 ) }}"></script>
- <script type="text/javascript">
- const shortbread = AWSCShortbread({
- domain: ".amazonaws.com",
-});
- shortbread.checkForCookieConsent();
- </script>
<a href="http://aws.amazon.com/privacy">Privacy</a> | <a href="http://aws.amazon.com/terms">Site Terms</a> | <a
href="#" onclick="shortbread.customizeCookies();">Cookie preferences</a> |
&copy; Copyright {{ copyright }} <a href="https://www.sphinx-doc.org/">Sphinx</a>.

15
debian/rules vendored
View file

@ -1,15 +0,0 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export PYBUILD_NAME=botocore
export PYBUILD_DISABLE=test
%:
dh $@ --with python3 --buildsystem=pybuild
override_dh_fixperms:
dh_fixperms
chmod -x $(CURDIR)/debian/python*-botocore/usr/lib/python*/dist-packages/botocore/data/*/*/*.json

4
debian/salsa-ci.yml vendored
View file

@ -1,4 +0,0 @@
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml

View file

@ -1 +0,0 @@
3.0 (quilt)

View file

@ -1 +0,0 @@
extend-diff-ignore="^[^/]+\.egg-info/"

View file

@ -1,4 +0,0 @@
Bug-Database: https://github.com/boto/botocore/issues
Bug-Submit: https://github.com/boto/botocore/issues/new
Repository: https://github.com/boto/botocore.git
Repository-Browse: https://github.com/boto/botocore

3
debian/watch vendored
View file

@ -1,3 +0,0 @@
version=3
opts="repacksuffix=+repack,dversionmangle=s/\+repack//g,repack,compression=xz" \
https://pypi.debian.net/botocore/botocore-(.*).tar.gz