[PR PATCH] Python botocore drop python 2

[PR PATCH] Python botocore drop python 2

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages python-botocore-drop-python-2
https://github.com/void-linux/void-packages/pull/17769

Python botocore drop python 2
- No packages use the python2 library
- only aws-cli use python3 library

A patch file from https://github.com/void-linux/void-packages/pull/17769.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-botocore-drop-python-2-17769.patch --]
[-- Type: text/x-diff, Size: 6463 bytes --]

From e0252a267426076bb30ddd2e6a835ecd44203444 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Wed, 25 Dec 2019 13:15:50 +0700
Subject: [PATCH 1/2] python-s3transfer: drop Python 2

---
 srcpkgs/python-s3transfer/template  | 26 --------------------------
 srcpkgs/python3-s3transfer          |  1 -
 srcpkgs/python3-s3transfer/template | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-s3transfer/template
 delete mode 120000 srcpkgs/python3-s3transfer
 create mode 100644 srcpkgs/python3-s3transfer/template

diff --git a/srcpkgs/python-s3transfer/template b/srcpkgs/python-s3transfer/template
deleted file mode 100644
index dd92eeff657..00000000000
--- a/srcpkgs/python-s3transfer/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-s3transfer'
-pkgname=python-s3transfer
-version=0.2.1
-revision=2
-archs=noarch
-wrksrc="s3transfer-${version}"
-build_style=python-module
-pycompile_module="s3transfer"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-botocore"
-short_desc="Amazon S3 Transfer Manager (Python2)"
-maintainer="Robert Lowry <bobertlo@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/boto/s3transfer"
-distfiles="https://github.com/boto/s3transfer/archive/${version}.tar.gz"
-checksum=4181e0cf31d1ff1c8233ddda7cc7efa5dd0cf9a1e47143b951a3389ff6812660
-
-python3-s3transfer_package() {
-	archs=noarch
-	depends="python3-botocore"
-	pycompile_module="s3transfer"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-s3transfer b/srcpkgs/python3-s3transfer
deleted file mode 120000
index f9f265aecc6..00000000000
--- a/srcpkgs/python3-s3transfer
+++ /dev/null
@@ -1 +0,0 @@
-python-s3transfer
\ No newline at end of file
diff --git a/srcpkgs/python3-s3transfer/template b/srcpkgs/python3-s3transfer/template
new file mode 100644
index 00000000000..193c90f6b53
--- /dev/null
+++ b/srcpkgs/python3-s3transfer/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-s3transfer'
+pkgname=python3-s3transfer
+version=0.2.1
+revision=3
+archs=noarch
+wrksrc="s3transfer-${version}"
+build_style=python3-module
+pycompile_module="s3transfer"
+hostmakedepends="python3-setuptools"
+depends="python3-botocore"
+short_desc="Amazon S3 Transfer Manager (Python)"
+maintainer="Robert Lowry <bobertlo@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/boto/s3transfer"
+distfiles="https://github.com/boto/s3transfer/archive/${version}.tar.gz"
+checksum=4181e0cf31d1ff1c8233ddda7cc7efa5dd0cf9a1e47143b951a3389ff6812660

From 0b0aabacd97a03b17223f1fc5b87b6c443cb463c Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Wed, 25 Dec 2019 13:21:24 +0700
Subject: [PATCH 2/2] python3-botocore: update to 1.13.45

Also drop python 2 package
---
 srcpkgs/python-botocore/template              | 26 -------------------
 srcpkgs/python3-botocore                      |  1 -
 .../patches/test-import.patch                 | 21 +++++++++++++++
 srcpkgs/python3-botocore/template             | 21 +++++++++++++++
 4 files changed, 42 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-botocore/template
 delete mode 120000 srcpkgs/python3-botocore
 create mode 100644 srcpkgs/python3-botocore/patches/test-import.patch
 create mode 100644 srcpkgs/python3-botocore/template

diff --git a/srcpkgs/python-botocore/template b/srcpkgs/python-botocore/template
deleted file mode 100644
index 36dfc4439a1..00000000000
--- a/srcpkgs/python-botocore/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-botocore'
-pkgname=python-botocore
-version=1.12.253
-revision=2
-archs=noarch
-wrksrc="botocore-${version}"
-build_style=python-module
-pycompile_module="botocore"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-dateutil python-docutils python-jmespath python-urllib3"
-short_desc="Core functionality library of boto 3 (Python2)"
-maintainer="Robert Lowry <bobertlo@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/boto/botocore"
-distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=abda48d86a79c05b7e449b0fb542165feaa8528fe7433ac08d0faa3cfad4d923
-
-python3-botocore_package() {
-	archs=noarch
-	pycompile_module="botocore"
-	depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-botocore b/srcpkgs/python3-botocore
deleted file mode 120000
index e4216cb4265..00000000000
--- a/srcpkgs/python3-botocore
+++ /dev/null
@@ -1 +0,0 @@
-python-botocore
\ No newline at end of file
diff --git a/srcpkgs/python3-botocore/patches/test-import.patch b/srcpkgs/python3-botocore/patches/test-import.patch
new file mode 100644
index 00000000000..5544e080b11
--- /dev/null
+++ b/srcpkgs/python3-botocore/patches/test-import.patch
@@ -0,0 +1,21 @@
+--- tests/__init__.py
++++ tests/__init__.py
+@@ -13,7 +13,7 @@
+ 
+ import os
+ import sys
+-import mock
++from unittest import mock
+ import time
+ import random
+ import shutil
+@@ -37,6 +37,9 @@
+ 
+ from nose.tools import assert_equal
+ 
++testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
++
+ import botocore.loaders
+ import botocore.session
+ from botocore.awsrequest import AWSResponse
diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
new file mode 100644
index 00000000000..c67831c3726
--- /dev/null
+++ b/srcpkgs/python3-botocore/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-botocore'
+pkgname=python3-botocore
+version=1.13.45
+revision=1
+archs=noarch
+wrksrc="botocore-${version}"
+build_style=python3-module
+pycompile_module="botocore"
+hostmakedepends="python3-setuptools"
+depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
+checkdepends="$depends python3-nose python3-jsonschema tox procps-ng"
+short_desc="Core functionality library of boto 3 (Python)"
+maintainer="Robert Lowry <bobertlo@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/boto/botocore"
+distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
+checksum=42eb08d9bd8c13c8dd5a8b4ec8e3a5648367516e2aea20fe800e2ceeb128f3da
+
+do_check() {
+	tox -e py${py3_ver/./}
+}

Re: [PR PATCH] [Closed]: Python botocore drop python 2

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

There's a closed pull request on the void-packages repository

Python botocore drop python 2
https://github.com/void-linux/void-packages/pull/17769

Description:
- No packages use the python2 library
- only aws-cli use python3 library