Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Certbot-related: correct dependencies
@ 2019-12-31  2:10 voidlinux-github
  2019-12-31  3:10 ` [PR PATCH] [Updated] " voidlinux-github
  2019-12-31 14:30 ` [PR PATCH] [Merged]: " voidlinux-github
  0 siblings, 2 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-31  2:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages certbot-drop-mock
https://github.com/void-linux/void-packages/pull/17915

Certbot-related: correct dependencies


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-certbot-drop-mock-17915.patch --]
[-- Type: text/x-diff, Size: 13787 bytes --]

From df4c1e7ada4f7d1590b0a316820d3313be952544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 09:05:40 +0700
Subject: [PATCH 1/7] python3-zope.proxy: correct dependencies

---
 srcpkgs/python3-zope.proxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-zope.proxy/template b/srcpkgs/python3-zope.proxy/template
index 71e13db6f36..1037695d0f9 100644
--- a/srcpkgs/python3-zope.proxy/template
+++ b/srcpkgs/python3-zope.proxy/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-zope.proxy'
 pkgname=python3-zope.proxy
 version=4.3.3
-revision=2
+revision=3
 wrksrc="zope.proxy-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
 makedepends="python3-devel"
-depends="python3-zope.interface python3-Sphinx python3-zope.testrunner
- python3-zope.security"
+depends="python3-zope.interface python3-setuptools"
+checkdepends="python3-zope.testrunner python3-zope.security"
 short_desc="Python generic transparent proxies"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="ZPL-2.1"

From 23d044e2f7ad5706d87da9147c3618e57214ecaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:27:18 +0700
Subject: [PATCH 2/7] python-zope.event: drop package

No packages depend on this package
---
 srcpkgs/python-zope.event/template  | 31 -----------------------------
 srcpkgs/python3-zope.event          |  1 -
 srcpkgs/python3-zope.event/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-zope.event/template
 delete mode 120000 srcpkgs/python3-zope.event
 create mode 100644 srcpkgs/python3-zope.event/template

diff --git a/srcpkgs/python-zope.event/template b/srcpkgs/python-zope.event/template
deleted file mode 100644
index 6518cb4529b..00000000000
--- a/srcpkgs/python-zope.event/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-zope.event'
-pkgname=python-zope.event
-version=4.4
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="zope/event"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Very basic event publishing system (Python2)"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-homepage="https://github.com/zopefoundation/zope.event"
-license="ZPL-2.1"
-distfiles="${PYPI_SITE}/z/zope.event/zope.event-${version}.tar.gz"
-checksum=69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-zope.event_package() {
-	archs=noarch
-	pycompile_module="zope/event"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-zope.event b/srcpkgs/python3-zope.event
deleted file mode 120000
index 581097bc6af..00000000000
--- a/srcpkgs/python3-zope.event
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.event
\ No newline at end of file
diff --git a/srcpkgs/python3-zope.event/template b/srcpkgs/python3-zope.event/template
new file mode 100644
index 00000000000..b8dee25b5f7
--- /dev/null
+++ b/srcpkgs/python3-zope.event/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-zope.event'
+pkgname=python3-zope.event
+version=4.4
+revision=3
+archs=noarch
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+pycompile_module="zope/event"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Very basic event publishing system for Python"
+maintainer="Toyam Cox <Vaelatern@gmail.com>"
+homepage="https://github.com/zopefoundation/zope.event"
+license="ZPL-2.1"
+distfiles="${PYPI_SITE}/z/zope.event/zope.event-${version}.tar.gz"
+checksum=69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 575e3de88077cca1969a4fbf5b7eb18d5ac86e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:28:02 +0700
Subject: [PATCH 3/7] python-zope.component: drop package

No packages depend on zope.component
---
 srcpkgs/python-zope.component/template  | 31 -------------------------
 srcpkgs/python3-zope.component          |  1 -
 srcpkgs/python3-zope.component/template | 20 ++++++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-zope.component/template
 delete mode 120000 srcpkgs/python3-zope.component
 create mode 100644 srcpkgs/python3-zope.component/template

diff --git a/srcpkgs/python-zope.component/template b/srcpkgs/python-zope.component/template
deleted file mode 100644
index 66ef109a4aa..00000000000
--- a/srcpkgs/python-zope.component/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-zope.component'
-pkgname=python-zope.component
-version=4.5
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="zope/component"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-zope.interface python-zope.event"
-short_desc="Zope component architecture for Python2"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.component"
-distfiles="${PYPI_SITE}/z/zope.component/zope.component-${version}.tar.gz"
-checksum=6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-zope.component_package() {
-	archs=noarch
-	pycompile_module="zope/component"
-	depends="python3-setuptools python3-zope.interface python3-zope.event"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-zope.component b/srcpkgs/python3-zope.component
deleted file mode 120000
index d2cff176aac..00000000000
--- a/srcpkgs/python3-zope.component
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.component
\ No newline at end of file
diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template
new file mode 100644
index 00000000000..5a6156dabce
--- /dev/null
+++ b/srcpkgs/python3-zope.component/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-zope.component'
+pkgname=python3-zope.component
+version=4.6
+revision=1
+archs=noarch
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-zope.deferredimport python3-zope.deprecation
+ python3-zope.interface python3-zope.event python3-zope.hookable"
+short_desc="Zope component architecture for Python"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="ZPL-2.1"
+homepage="https://www.zope.org"
+distfiles="${PYPI_SITE}/z/zope.component/zope.component-${version}.tar.gz"
+checksum=ec2afc5bbe611dcace98bb39822c122d44743d635dafc7315b9aef25097db9e6
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From c956fd2b74ffbae11e5c0569919f8dcb5d5784b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:29:15 +0700
Subject: [PATCH 4/7] python3-zope.deprecation: add mising dependencies

---
 srcpkgs/python3-zope.deprecation/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.deprecation/template b/srcpkgs/python3-zope.deprecation/template
index 614cee29f70..854c67dfa8a 100644
--- a/srcpkgs/python3-zope.deprecation/template
+++ b/srcpkgs/python3-zope.deprecation/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-zope.deprecation'
 pkgname=python3-zope.deprecation
 version=4.4.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="zope.deprecation-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+depends=python3
 short_desc="Python library to handle automated deprecations"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="ZPL-2.1"

From f2abe83d0b4b01a755fc144ee72da93faaa98451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:29:51 +0700
Subject: [PATCH 5/7] python-zope.interface: update to 4.7.1.

---
 srcpkgs/python-zope.interface/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 1dbcbecd377..3be1f5da9ed 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,7 +1,7 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
-version=4.6.0
-revision=3
+version=4.7.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 pycompile_module="zope"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/zopefoundation/zope.interface"
 license="ZPL-2.1"
 distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5
+checksum=4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487
 
 post_install() {
 	# zope.interface provides the zope namespace

From f9fee1fe46c342e53fc9efdae541505db198d08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:30:37 +0700
Subject: [PATCH 6/7] certbot: correct dependencies, remove tests

---
 srcpkgs/certbot/patches/remove-mock.patch | 10 ++++++++++
 srcpkgs/certbot/template                  | 17 +++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/certbot/patches/remove-mock.patch

diff --git a/srcpkgs/certbot/patches/remove-mock.patch b/srcpkgs/certbot/patches/remove-mock.patch
new file mode 100644
index 00000000000..f8be01a01bf
--- /dev/null
+++ b/srcpkgs/certbot/patches/remove-mock.patch
@@ -0,0 +1,10 @@
+--- setup.py
++++ setup.py
+@@ -45,7 +45,6 @@
+     # 1.1.0+ is required to avoid the warnings described at
+     # https://github.com/certbot/josepy/issues/13.
+     'josepy>=1.1.0',
+-    'mock',
+     'parsedatetime>=1.3',  # Calendar.parseDT
+     'pyrfc3339',
+     'pytz',
diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 008d7610767..0be81611c5c 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,18 +1,23 @@
 # Template file for 'certbot'
 pkgname=certbot
 version=1.0.0
-revision=2
+revision=3
 archs=noarch
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3 python3-acme python3-ConfigArgParse python3-configobj
- python3-cryptography python3-josepy python3-pyrfc3339 python3-pytz
- python3-zope.component python3-zope.interface python3-parsedatetime
- python3-zope.hookable python3-mock python3-zope.deferredimport
- python3-zope.deprecation"
+depends="python3-acme python3-ConfigArgParse python3-configobj
+ python3-cryptography python3-distro python3-josepy python3-parsedatetime
+ python3-pyrfc3339 python3-pytz python3-setuptools
+ python3-zope.component python3-zope.interface"
+checkdepends="$depends python3-py python3-pluggy python3-wcwidth
+ python3-more-itertools python3-pytest"
 short_desc="Let's Encrypt certificate renewal automation utility"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
 checksum=86b82d31db19fffffb0d6b218951e2121ef514e3ff659aa042deaf92a33e302a
+
+post_install() {
+	rm -rf ${DESTDIR}/${py3_sitelib}/certbot/tests
+}

From eae75460d73458843452d39257b697bd5a286d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 09:10:18 +0700
Subject: [PATCH 7/7] python-future: update to 0.18.2.

---
 srcpkgs/python-future/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python-future/template b/srcpkgs/python-future/template
index 6cd53908823..b39d9fe6c72 100644
--- a/srcpkgs/python-future/template
+++ b/srcpkgs/python-future/template
@@ -1,13 +1,10 @@
 # Template file for 'python-future'
 pkgname=python-future
-version=0.17.1
-revision=2
+version=0.18.2
+revision=1
 archs=noarch
 wrksrc="future-${version}"
 build_style=python-module
-pycompile_module="_dummy_thread _markupbase _thread builtins
- copyreg future html http libfuturize libpasteurize past queue reprlib
- socketserver tkinter winreg xmlrpc"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="Clean single-source support for Python 3 and 2 (Python2)"
@@ -15,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://python-future.org/"
 license="MIT"
 distfiles="${PYPI_SITE}/f/future/future-${version}.tar.gz"
-checksum=67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8
+checksum=b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d
 
 alternatives="
  future:futurize:/usr/bin/futurize2
@@ -30,9 +27,6 @@ python3-future_package() {
 	 future:futurize:/usr/bin/futurize3
 	 future:pasteurize:/usr/bin/pasteurize3"
 	archs=noarch
-	pycompile_module="_dummy_thread _markupbase _thread builtins
-	 copyreg future html http libfuturize libpasteurize past queue reprlib
-	 socketserver tkinter winreg xmlrpc"
 	depends="python3-setuptools"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Certbot-related: correct dependencies
  2019-12-31  2:10 [PR PATCH] Certbot-related: correct dependencies voidlinux-github
@ 2019-12-31  3:10 ` voidlinux-github
  2019-12-31 14:30 ` [PR PATCH] [Merged]: " voidlinux-github
  1 sibling, 0 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-31  3:10 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages certbot-drop-mock
https://github.com/void-linux/void-packages/pull/17915

Certbot-related: correct dependencies


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-certbot-drop-mock-17915.patch --]
[-- Type: text/x-diff, Size: 15472 bytes --]

From df4c1e7ada4f7d1590b0a316820d3313be952544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 09:05:40 +0700
Subject: [PATCH 1/8] python3-zope.proxy: correct dependencies

---
 srcpkgs/python3-zope.proxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-zope.proxy/template b/srcpkgs/python3-zope.proxy/template
index 71e13db6f36..1037695d0f9 100644
--- a/srcpkgs/python3-zope.proxy/template
+++ b/srcpkgs/python3-zope.proxy/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-zope.proxy'
 pkgname=python3-zope.proxy
 version=4.3.3
-revision=2
+revision=3
 wrksrc="zope.proxy-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
 makedepends="python3-devel"
-depends="python3-zope.interface python3-Sphinx python3-zope.testrunner
- python3-zope.security"
+depends="python3-zope.interface python3-setuptools"
+checkdepends="python3-zope.testrunner python3-zope.security"
 short_desc="Python generic transparent proxies"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="ZPL-2.1"

From 347b5c7a519f288672ee700f889adfdac4a5187a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:27:18 +0700
Subject: [PATCH 2/8] python-zope.event: drop package

No packages depend on this package
---
 srcpkgs/python-zope.event/template  | 31 -----------------------------
 srcpkgs/python3-zope.event          |  1 -
 srcpkgs/python3-zope.event/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-zope.event/template
 delete mode 120000 srcpkgs/python3-zope.event
 create mode 100644 srcpkgs/python3-zope.event/template

diff --git a/srcpkgs/python-zope.event/template b/srcpkgs/python-zope.event/template
deleted file mode 100644
index 6518cb4529b..00000000000
--- a/srcpkgs/python-zope.event/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-zope.event'
-pkgname=python-zope.event
-version=4.4
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="zope/event"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Very basic event publishing system (Python2)"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-homepage="https://github.com/zopefoundation/zope.event"
-license="ZPL-2.1"
-distfiles="${PYPI_SITE}/z/zope.event/zope.event-${version}.tar.gz"
-checksum=69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-zope.event_package() {
-	archs=noarch
-	pycompile_module="zope/event"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-zope.event b/srcpkgs/python3-zope.event
deleted file mode 120000
index 581097bc6af..00000000000
--- a/srcpkgs/python3-zope.event
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.event
\ No newline at end of file
diff --git a/srcpkgs/python3-zope.event/template b/srcpkgs/python3-zope.event/template
new file mode 100644
index 00000000000..0ca1af6cfc4
--- /dev/null
+++ b/srcpkgs/python3-zope.event/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-zope.event'
+pkgname=python3-zope.event
+version=4.4
+revision=3
+archs=noarch
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+pycompile_module="zope/event"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Very basic event publishing system for Python"
+maintainer="Toyam Cox <Vaelatern@gmail.com>"
+license="ZPL-2.1"
+homepage="https://github.com/zopefoundation/zope.event"
+distfiles="${PYPI_SITE}/z/zope.event/zope.event-${version}.tar.gz"
+checksum=69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 48a4675b19b7c5b97ed586df3fe59d760937cb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:28:02 +0700
Subject: [PATCH 3/8] python-zope.component: drop package

No packages depend on zope.component
---
 srcpkgs/python-zope.component/template  | 31 -------------------------
 srcpkgs/python3-zope.component          |  1 -
 srcpkgs/python3-zope.component/template | 20 ++++++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-zope.component/template
 delete mode 120000 srcpkgs/python3-zope.component
 create mode 100644 srcpkgs/python3-zope.component/template

diff --git a/srcpkgs/python-zope.component/template b/srcpkgs/python-zope.component/template
deleted file mode 100644
index 66ef109a4aa..00000000000
--- a/srcpkgs/python-zope.component/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-zope.component'
-pkgname=python-zope.component
-version=4.5
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="zope/component"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-zope.interface python-zope.event"
-short_desc="Zope component architecture for Python2"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.component"
-distfiles="${PYPI_SITE}/z/zope.component/zope.component-${version}.tar.gz"
-checksum=6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-zope.component_package() {
-	archs=noarch
-	pycompile_module="zope/component"
-	depends="python3-setuptools python3-zope.interface python3-zope.event"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-zope.component b/srcpkgs/python3-zope.component
deleted file mode 120000
index d2cff176aac..00000000000
--- a/srcpkgs/python3-zope.component
+++ /dev/null
@@ -1 +0,0 @@
-python-zope.component
\ No newline at end of file
diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template
new file mode 100644
index 00000000000..5a6156dabce
--- /dev/null
+++ b/srcpkgs/python3-zope.component/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-zope.component'
+pkgname=python3-zope.component
+version=4.6
+revision=1
+archs=noarch
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-zope.deferredimport python3-zope.deprecation
+ python3-zope.interface python3-zope.event python3-zope.hookable"
+short_desc="Zope component architecture for Python"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="ZPL-2.1"
+homepage="https://www.zope.org"
+distfiles="${PYPI_SITE}/z/zope.component/zope.component-${version}.tar.gz"
+checksum=ec2afc5bbe611dcace98bb39822c122d44743d635dafc7315b9aef25097db9e6
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From e725b5c2966a3e332f038f0ed237532768aadcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:29:15 +0700
Subject: [PATCH 4/8] python3-zope.deprecation: add mising dependencies

---
 srcpkgs/python3-zope.deprecation/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.deprecation/template b/srcpkgs/python3-zope.deprecation/template
index 614cee29f70..854c67dfa8a 100644
--- a/srcpkgs/python3-zope.deprecation/template
+++ b/srcpkgs/python3-zope.deprecation/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-zope.deprecation'
 pkgname=python3-zope.deprecation
 version=4.4.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="zope.deprecation-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+depends=python3
 short_desc="Python library to handle automated deprecations"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="ZPL-2.1"

From 98583f866332b6c4f7a9d74f4a86740cbe7466c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:29:51 +0700
Subject: [PATCH 5/8] python-zope.interface: update to 4.7.1.

---
 srcpkgs/python-zope.interface/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 1dbcbecd377..37864186e5e 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,7 +1,7 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
-version=4.6.0
-revision=3
+version=4.7.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 pycompile_module="zope"
@@ -10,10 +10,10 @@ makedepends="python-devel python3-devel"
 depends="python-setuptools"
 short_desc="Zope interfaces for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/zopefoundation/zope.interface"
 license="ZPL-2.1"
+homepage="https://github.com/zopefoundation/zope.interface"
 distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5
+checksum=4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487
 
 post_install() {
 	# zope.interface provides the zope namespace

From fae78901ab303a308bcc6b4fe45f10afab1eb6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 08:30:37 +0700
Subject: [PATCH 6/8] certbot: correct dependencies, remove tests

---
 srcpkgs/certbot/patches/remove-mock.patch | 10 ++++++++++
 srcpkgs/certbot/template                  | 17 +++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/certbot/patches/remove-mock.patch

diff --git a/srcpkgs/certbot/patches/remove-mock.patch b/srcpkgs/certbot/patches/remove-mock.patch
new file mode 100644
index 00000000000..f8be01a01bf
--- /dev/null
+++ b/srcpkgs/certbot/patches/remove-mock.patch
@@ -0,0 +1,10 @@
+--- setup.py
++++ setup.py
+@@ -45,7 +45,6 @@
+     # 1.1.0+ is required to avoid the warnings described at
+     # https://github.com/certbot/josepy/issues/13.
+     'josepy>=1.1.0',
+-    'mock',
+     'parsedatetime>=1.3',  # Calendar.parseDT
+     'pyrfc3339',
+     'pytz',
diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 008d7610767..0be81611c5c 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,18 +1,23 @@
 # Template file for 'certbot'
 pkgname=certbot
 version=1.0.0
-revision=2
+revision=3
 archs=noarch
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3 python3-acme python3-ConfigArgParse python3-configobj
- python3-cryptography python3-josepy python3-pyrfc3339 python3-pytz
- python3-zope.component python3-zope.interface python3-parsedatetime
- python3-zope.hookable python3-mock python3-zope.deferredimport
- python3-zope.deprecation"
+depends="python3-acme python3-ConfigArgParse python3-configobj
+ python3-cryptography python3-distro python3-josepy python3-parsedatetime
+ python3-pyrfc3339 python3-pytz python3-setuptools
+ python3-zope.component python3-zope.interface"
+checkdepends="$depends python3-py python3-pluggy python3-wcwidth
+ python3-more-itertools python3-pytest"
 short_desc="Let's Encrypt certificate renewal automation utility"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
 checksum=86b82d31db19fffffb0d6b218951e2121ef514e3ff659aa042deaf92a33e302a
+
+post_install() {
+	rm -rf ${DESTDIR}/${py3_sitelib}/certbot/tests
+}

From 2831eab31ebe58a7e5e2afa3607de6efd4a63448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 09:10:18 +0700
Subject: [PATCH 7/8] python-future: update to 0.18.2.

---
 srcpkgs/python-future/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python-future/template b/srcpkgs/python-future/template
index 6cd53908823..88b09a1944f 100644
--- a/srcpkgs/python-future/template
+++ b/srcpkgs/python-future/template
@@ -1,21 +1,18 @@
 # Template file for 'python-future'
 pkgname=python-future
-version=0.17.1
-revision=2
+version=0.18.2
+revision=1
 archs=noarch
 wrksrc="future-${version}"
 build_style=python-module
-pycompile_module="_dummy_thread _markupbase _thread builtins
- copyreg future html http libfuturize libpasteurize past queue reprlib
- socketserver tkinter winreg xmlrpc"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools"
 short_desc="Clean single-source support for Python 3 and 2 (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://python-future.org/"
 license="MIT"
+homepage="https://python-future.org/"
 distfiles="${PYPI_SITE}/f/future/future-${version}.tar.gz"
-checksum=67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8
+checksum=b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d
 
 alternatives="
  future:futurize:/usr/bin/futurize2
@@ -30,9 +27,6 @@ python3-future_package() {
 	 future:futurize:/usr/bin/futurize3
 	 future:pasteurize:/usr/bin/pasteurize3"
 	archs=noarch
-	pycompile_module="_dummy_thread _markupbase _thread builtins
-	 copyreg future html http libfuturize libpasteurize past queue reprlib
-	 socketserver tkinter winreg xmlrpc"
 	depends="python3-setuptools"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {

From f6a2eb9b39bb285aa6222c334e2ca6d3dc185152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 31 Dec 2019 10:09:36 +0700
Subject: [PATCH 8/8] python3-acme: correct dependencies

---
 srcpkgs/python3-acme/patches/remove-mock.patch | 10 ++++++++++
 srcpkgs/python3-acme/template                  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-acme/patches/remove-mock.patch

diff --git a/srcpkgs/python3-acme/patches/remove-mock.patch b/srcpkgs/python3-acme/patches/remove-mock.patch
new file mode 100644
index 00000000000..e6eaf391829
--- /dev/null
+++ b/srcpkgs/python3-acme/patches/remove-mock.patch
@@ -0,0 +1,10 @@
+--- setup.py.orig	2019-12-31 08:33:16.602213015 +0700
++++ setup.py	2019-12-31 08:33:32.930280210 +0700
+@@ -14,7 +14,6 @@
+     # 1.1.0+ is required to avoid the warnings described at
+     # https://github.com/certbot/josepy/issues/13.
+     'josepy>=1.1.0',
+-    'mock',
+     # Connection.set_tlsext_host_name (>=0.13)
+     'PyOpenSSL>=0.13.1',
+     'pyrfc3339',
diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 482937962d6..fa93301ffdf 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
 version=1.0.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="acme-${version}"
 build_style=python3-module

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Certbot-related: correct dependencies
  2019-12-31  2:10 [PR PATCH] Certbot-related: correct dependencies voidlinux-github
  2019-12-31  3:10 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-12-31 14:30 ` voidlinux-github
  1 sibling, 0 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-31 14:30 UTC (permalink / raw)
  To: ml

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

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

Certbot-related: correct dependencies
https://github.com/void-linux/void-packages/pull/17915

Description:
- mock shouldn't be dependencies for runtime
- correct zope dependencies list

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-31 14:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-31  2:10 [PR PATCH] Certbot-related: correct dependencies voidlinux-github
2019-12-31  3:10 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-31 14:30 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).