aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2022-11-23 12:24:55 +0000
committerpsykose <alice@ayaya.dev>2022-11-23 13:24:55 +0100
commit32bc3b8ad6489f174d5491738e0fd2ecb0f97173 (patch)
tree42c08ea576100cae003d3e236dc8ea86c3354c94
parentc3c0825b7007c406b236e2d4ac2bfb040c8dfefa (diff)
downloadaports-32bc3b8ad6489f174d5491738e0fd2ecb0f97173.tar.gz
aports-32bc3b8ad6489f174d5491738e0fd2ecb0f97173.tar.bz2
aports-32bc3b8ad6489f174d5491738e0fd2ecb0f97173.tar.xz
community/py3-softlayer: fix py3.11 compat
-rw-r--r--community/py3-softlayer/APKBUILD11
-rw-r--r--community/py3-softlayer/py3.11.patch13
2 files changed, 19 insertions, 5 deletions
diff --git a/community/py3-softlayer/APKBUILD b/community/py3-softlayer/APKBUILD
index c7a4a3a2fc..fa5c60ca80 100644
--- a/community/py3-softlayer/APKBUILD
+++ b/community/py3-softlayer/APKBUILD
@@ -9,8 +9,10 @@ arch="noarch"
license="MIT"
depends="py3-click py3-prompt_toolkit py3-prettytable3 py3-pygments py3-requests py3-rich py3-urllib3"
makedepends="py3-setuptools"
-checkdepends="py3-pytest py3-pytest-mock py3-testtools py3-softlayer-zeep"
-source="$pkgname-$pkgver.tar.gz::https://github.com/softlayer/softlayer-python/archive/v$pkgver.tar.gz"
+checkdepends="py3-pytest py3-pytest-mock py3-testtools py3-softlayer-zeep python3-tkinter"
+source="$pkgname-$pkgver.tar.gz::https://github.com/softlayer/softlayer-python/archive/v$pkgver.tar.gz
+ py3.11.patch
+ "
builddir="$srcdir/softlayer-python-$pkgver"
build() {
@@ -18,9 +20,7 @@ build() {
}
check() {
- #py3tkinter needed for this test
- python3 -m pytest \
- --deselect=tests/CLI/environment_tests.py::EnvironmentTests::test_getpass_issues1436
+ python3 -m pytest
}
package() {
@@ -31,4 +31,5 @@ package() {
sha512sums="
23b47c4a3c823521305daf329baefc7f201db4d2fd08eb4f83bc1b805f5d428379a74933fd47b22047c6b6d03fddc0a837b7b311ec07862975fb4976332e11da py3-softlayer-6.1.2.tar.gz
+e0e0a46f76e56a8e5b72f54594e554ccd1d2eb4b93cd14cb0cc714a17c7ce8a6a9de4540a9eb2bad81f7863d913e26249f8c15bc6f51b921fc29187828908498 py3.11.patch
"
diff --git a/community/py3-softlayer/py3.11.patch b/community/py3-softlayer/py3.11.patch
new file mode 100644
index 0000000000..2da931739c
--- /dev/null
+++ b/community/py3-softlayer/py3.11.patch
@@ -0,0 +1,13 @@
+diff --git a/SoftLayer/CLI/sshkey/add.py b/SoftLayer/CLI/sshkey/add.py
+index 93b523c..fc6ec69 100644
+--- a/SoftLayer/CLI/sshkey/add.py
++++ b/SoftLayer/CLI/sshkey/add.py
+@@ -33,7 +33,7 @@ def cli(env, label, in_file, key, note):
+ if key:
+ key_text = key
+ else:
+- with open(path.expanduser(in_file), 'rU', encoding="utf-8") as key_file:
++ with open(path.expanduser(in_file), 'r', encoding="utf-8") as key_file:
+ key_text = key_file.read().strip()
+ key_file.close()
+