Re: [PR REVIEW] python3-jsonschema: update to 3.2.0

Re: [PR REVIEW] python3-jsonschema: update to 3.2.0

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#discussion_r536914103

Comment:
Use master

Re: [PR REVIEW] python3-jsonschema: update to 3.2.0

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#discussion_r536914198

Comment:
Or perhaps not.

Re: python3-jsonschema: update to 3.2.0

[ndowens]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-739431191

Comment:
> If you're adding `pyrsistent` to so many packages, shouldn't `jsonschema` itself depend on it, instead?
> 
> EDIT: I see
> 
> > the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way.
> 
> Can you explain why?

I only decided against doing it that way due to it not actually depending on them, so didn't think that would be correct way, even though it makes it simpler. Though I can go with the easy way, and bit cleaner in some way. 

Re: [PR PATCH] [Updated] python3-jsonschema: update to 3.2.0

[ndowens]

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

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

https://github.com/ndowens/void-packages python-jsonschema
https://github.com/void-linux/void-packages/pull/26806

python3-jsonschema: update to 3.2.0
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge 

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

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

From cd0700f79bdafcd1a94388fcc915245ad91b016e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 13:40:11 -0600
Subject: [PATCH 1/6] gns3-server: fix aiohttp version

Upon launch, gns3server gives certain version of aiohttp is needed.
This fixes launch error
---
 srcpkgs/gns3-server/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index e4eeb2de3af..4246ea683ad 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.10
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
@@ -18,6 +18,7 @@ checksum=4388974043680e877533564cb5a2efe2ed215a59a13abcabb3ac29d9b92f86e0
 pre_build() {
 	# relax requirements
 	vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \
+		-e 's|aiohttp==.*|aiohttp>=3.7.3|' \
 		-e 's|aiohttp-cors.*|aiohttp-cors>=0.7.0|' \
 		-e 's|jsonschema.*|jsonschema>=2.6.0|' \
 		-e 's|psutil.*|psutil>=5.6.7|' \

From f6f724c4dc322b7420254432364cf581dd97c321 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:50:40 -0600
Subject: [PATCH 2/6] docker-compose: add missing deps

After update to python3-jsonschema, python3-attrs and python3-pyrsistent is needed
---
 srcpkgs/docker-compose/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index c5fcdb65a0a..eea8c15e4a5 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,14 +1,15 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=1.27.4
-revision=2
+revision=3
 wrksrc="compose-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-docker>=3.7.0
  python3-dockerpty python3-websocket-client python3-requests python3-docopt
  python3-yaml python3-six python3-texttable python3-cached-property
- python3-paramiko>=2.4.2 python3-dotenv python3-distro"
+ python3-paramiko>=2.4.2 python3-dotenv python3-distro python3-attrs
+ python3-pyrsistent"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"

From 26f67e5167587b89299678b37d83f91df8cdffc6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:52:18 -0600
Subject: [PATCH 3/6] anki: add missing deps After update to
 python3-jsonschema, python3-attrs and python3-pyrsistent is needed

---
 srcpkgs/anki/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index 55976fbd26e..67b197b0a94 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,11 +1,12 @@
 # Template file for 'anki'
 pkgname=anki
 version=2.1.15
-revision=4
+revision=5
 build_style=gnu-makefile
 depends="python3-PyQt5-webengine python3-requests python3-SQLAlchemy
  python3-PyAudio python3-mpv python3-Markdown python3-send2trash
- python3-BeautifulSoup4 python3-decorator python3-jsonschema"
+ python3-BeautifulSoup4 python3-decorator python3-jsonschema
+ python3-attrs python3-pyrsistent"
 short_desc="Spaced repetition flashcard program"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="AGPL-3.0-or-later"

From ec8828ee7b903be8f892c862adf6b360e18c8b47 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 13:02:13 -0600
Subject: [PATCH 4/6] gns3-gui: add missing deps

After update to python3-jsonschema, python3-attrs and python3-pyrsistent is needed
---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 0dff36e945d..3a1e4a91e5a 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,12 +1,12 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.10
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry
  python3-PyQt5-svg python3-PyQt5-websockets python3-sip xterm inetutils-telnet
- gns3-net-converter python3-distro"
+ gns3-net-converter python3-distro python3-attrs python3-pyrsistent"
 checkdepends="${depends}"
 short_desc="Graphical Network Simulator 3 - GUI"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 9e7b4177a62bb98895b57dea583506911a2ff5c9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:28:24 -0600
Subject: [PATCH 5/6] python3-pyrsistent: New package

---
 srcpkgs/python3-pyrsistent/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pyrsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
new file mode 100644
index 00000000000..5733e49d221
--- /dev/null
+++ b/srcpkgs/python3-pyrsistent/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyrsistent'
+pkgname=python3-pyrsistent
+version=0.17.3
+revision=1
+wrksrc="pyrsistent-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python persistent immutable data structures"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MIT"
+homepage="https://github.com/tobgu/pyrsistent/"
+distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+
+post_install() {
+	vlicense LICENCE.mit LICENSE
+}

From d955532dea68561e54d10348e3c744ae5e519312 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:15:09 -0600
Subject: [PATCH 6/6] python3-jsonschema: update to 3.2.0

---
 srcpkgs/python3-jsonschema/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..4fb828475b1 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,27 +1,21 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
-version=2.6.0
-revision=6
+version=3.2.0
+revision=1
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-setuptools python3-six"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Julian/jsonschema"
+changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
 conflicts="python-jsonschema>=0"
 
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
 post_install() {
 	vlicense COPYING LICENSE
 }

Re: python3-jsonschema: update to 3.2.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-739432232

Comment:
People are using `docker-compose` already, they won't worry about bloat :P 

Re: python3-jsonschema: update to 3.2.0

[ndowens]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-739432428

Comment:
Do you want me to drop gns3-gui from my commit, since there is now another PR?

Re: python3-jsonschema: update to 3.2.0

[ndowens]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-739432428

Comment:
Do you want me to drop gns3-gui from my commit, since there is now another PR?

Re: [PR PATCH] [Updated] python3-jsonschema: update to 3.2.0

[ndowens]

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

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

https://github.com/ndowens/void-packages python-jsonschema
https://github.com/void-linux/void-packages/pull/26806

python3-jsonschema: update to 3.2.0
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge 

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

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

From e98654e2762e3f23cc62d35c4372fb2c394b7afb Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:15:09 -0600
Subject: [PATCH 1/2] python3-jsonschema: update to 3.2.0

---
 srcpkgs/python3-jsonschema/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..695648cbd76 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,27 +1,21 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
-version=2.6.0
-revision=6
+version=3.2.0
+revision=1
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-setuptools python3-six python3-attrs python3-jsonschema"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Julian/jsonschema"
+changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
 conflicts="python-jsonschema>=0"
 
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
 post_install() {
 	vlicense COPYING LICENSE
 }

From 2cd7c71b187484eea3d16ec658d4e7cd00acc3fe Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:28:24 -0600
Subject: [PATCH 2/2] python3-pyrsistent: New package

---
 srcpkgs/python3-pyrsistent/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pyrsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
new file mode 100644
index 00000000000..5733e49d221
--- /dev/null
+++ b/srcpkgs/python3-pyrsistent/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyrsistent'
+pkgname=python3-pyrsistent
+version=0.17.3
+revision=1
+wrksrc="pyrsistent-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python persistent immutable data structures"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MIT"
+homepage="https://github.com/tobgu/pyrsistent/"
+distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+
+post_install() {
+	vlicense LICENCE.mit LICENSE
+}

Re: python3-jsonschema: update to 3.2.0

[ndowens]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-739432751

Comment:
@ericonr I added those depends to jsonschema pkg and dropped the others from commit, namely because no need to update the others now.

Re: [PR REVIEW] python3-jsonschema: update to 3.2.0

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#discussion_r544811992

Comment:
I think you typoed here :)

Re: [PR PATCH] [Updated] python3-jsonschema: update to 3.2.0

[ndowens]

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

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

https://github.com/ndowens/void-packages python-jsonschema
https://github.com/void-linux/void-packages/pull/26806

python3-jsonschema: update to 3.2.0
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge 

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

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

From 478cd1c24c0dde3e2b68477f2d01b00f9cb5134c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:28:24 -0600
Subject: [PATCH 1/2] New package: python3-pyrsistent

---
 srcpkgs/python3-pyrsistent/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pyrsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
new file mode 100644
index 00000000000..5733e49d221
--- /dev/null
+++ b/srcpkgs/python3-pyrsistent/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyrsistent'
+pkgname=python3-pyrsistent
+version=0.17.3
+revision=1
+wrksrc="pyrsistent-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python persistent immutable data structures"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MIT"
+homepage="https://github.com/tobgu/pyrsistent/"
+distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+
+post_install() {
+	vlicense LICENCE.mit LICENSE
+}

From 9fc60911c6fcd0be00076daeb0056ba1b734554a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:15:09 -0600
Subject: [PATCH 2/2] python3-jsonschema: update to 3.2.0

---
 srcpkgs/python3-jsonschema/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..655473af97f 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,27 +1,21 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
-version=2.6.0
-revision=6
+version=3.2.0
+revision=1
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-setuptools python3-six python3-attrs python3-pyrsistent"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Julian/jsonschema"
+changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
 conflicts="python-jsonschema>=0"
 
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
 post_install() {
 	vlicense COPYING LICENSE
 }

Re: python3-jsonschema: update to 3.2.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-747678314

Comment:
Please fix the test dependencies.

Re: python3-jsonschema: update to 3.2.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-747678314

Comment:
Please fix the test dependencies. It's looking for python3-six, among others.

Re: [PR PATCH] [Updated] python3-jsonschema: update to 3.2.0

[ndowens]

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

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

https://github.com/ndowens/void-packages python-jsonschema
https://github.com/void-linux/void-packages/pull/26806

python3-jsonschema: update to 3.2.0
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge 

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

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

From 945af35d9b28c1d36192b6d055d57ad2c99e6a92 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:28:24 -0600
Subject: [PATCH 1/2] New package: python3-pyrsistent

---
 srcpkgs/python3-pyrsistent/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-pyrsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
new file mode 100644
index 00000000000..3dacb47944b
--- /dev/null
+++ b/srcpkgs/python3-pyrsistent/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyrsistent'
+pkgname=python3-pyrsistent
+version=0.17.3
+revision=1
+wrksrc="pyrsistent-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-devel python3-hypothesis"
+short_desc="Python persistent immutable data structures"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MIT"
+homepage="https://github.com/tobgu/pyrsistent/"
+distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+
+post_install() {
+	vlicense LICENCE.mit LICENSE
+}

From 13a3cb2397f727fc029b1bc6c6a4cdc0e2c7b420 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:15:09 -0600
Subject: [PATCH 2/2] python3-jsonschema: update to 3.2.0

---
 srcpkgs/python3-jsonschema/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..7757034dda7 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,27 +1,22 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
-version=2.6.0
-revision=6
+version=3.2.0
+revision=1
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-setuptools python3-six python3-attrs python3-pyrsistent"
+checkdepends="python3-pyrsistent python3-six python3-Twisted"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Julian/jsonschema"
+changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
 conflicts="python-jsonschema>=0"
 
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
 post_install() {
 	vlicense COPYING LICENSE
 }

Re: [PR PATCH] [Updated] python3-jsonschema: update to 3.2.0

[ndowens]

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

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

https://github.com/ndowens/void-packages python-jsonschema
https://github.com/void-linux/void-packages/pull/26806

python3-jsonschema: update to 3.2.0
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge 

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

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

From 945af35d9b28c1d36192b6d055d57ad2c99e6a92 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:28:24 -0600
Subject: [PATCH 1/2] New package: python3-pyrsistent

---
 srcpkgs/python3-pyrsistent/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-pyrsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
new file mode 100644
index 00000000000..3dacb47944b
--- /dev/null
+++ b/srcpkgs/python3-pyrsistent/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyrsistent'
+pkgname=python3-pyrsistent
+version=0.17.3
+revision=1
+wrksrc="pyrsistent-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-devel python3-hypothesis"
+short_desc="Python persistent immutable data structures"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MIT"
+homepage="https://github.com/tobgu/pyrsistent/"
+distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+
+post_install() {
+	vlicense LICENCE.mit LICENSE
+}

From 78947f5f10449b4a77dfd3afe677c7bdd87dc7ba Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:15:09 -0600
Subject: [PATCH 2/2] python3-jsonschema: update to 3.2.0

---
 srcpkgs/python3-jsonschema/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..e678124b294 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,27 +1,22 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
-version=2.6.0
-revision=6
+version=3.2.0
+revision=1
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-setuptools python3-six python3-attrs python3-pyrsistent"
+checkdepends="python3-pyrsistent python3-pytest python3-six python3-Twisted"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Julian/jsonschema"
+changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
 conflicts="python-jsonschema>=0"
 
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
 post_install() {
 	vlicense COPYING LICENSE
 }

Re: python3-jsonschema: update to 3.2.0

[ndowens]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-747691486

Comment:
> Please fix the test dependencies. It's looking for python3-six, among others.

Done

Re: python3-jsonschema: update to 3.2.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-747704182

Comment:
Argh, what a mess... MIght be best to just disable tests. It's downloading a bunch of packages :/

Re: python3-jsonschema: update to 3.2.0

[ndowens]

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-747705274

Comment:
> Argh, what a mess... MIght be best to just disable tests. It's downloading a bunch of packages :/

Whatever ya think is best, atleast they do pass the tests

Re: [PR PATCH] [Updated] python3-jsonschema: update to 3.2.0

[ndowens]

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

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

https://github.com/ndowens/void-packages python-jsonschema
https://github.com/void-linux/void-packages/pull/26806

python3-jsonschema: update to 3.2.0
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge 

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

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

From cfb7bf27ea52ae3c0a9419ef972a7ed1c5d3e3d7 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:28:24 -0600
Subject: [PATCH 1/2] New package: python3-pyrsistent

---
 srcpkgs/python3-pyrsistent/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyrsistent/template

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
new file mode 100644
index 00000000000..6242a0fab21
--- /dev/null
+++ b/srcpkgs/python3-pyrsistent/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyrsistent'
+pkgname=python3-pyrsistent
+version=0.17.3
+revision=1
+wrksrc="pyrsistent-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python persistent immutable data structures"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MIT"
+homepage="https://github.com/tobgu/pyrsistent/"
+distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+
+do_check() {
+	: # Disable as it downloads many packages
+}
+
+post_install() {
+	vlicense LICENCE.mit LICENSE
+}

From 8e3fd6410f5211bc76a1a0a7ca7e2763b5a72412 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 12:15:09 -0600
Subject: [PATCH 2/2] python3-jsonschema: update to 3.2.0

---
 srcpkgs/python3-jsonschema/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index c3954b106dc..4a26bbe9cd6 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -1,27 +1,25 @@
 # Template file for 'python3-jsonschema'
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
-version=2.6.0
-revision=6
+version=3.2.0
+revision=1
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3-setuptools python3-six python3-attrs python3-pyrsistent"
 short_desc="Implementation of JSON Schema for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Julian/jsonschema"
+changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+checksum=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
 conflicts="python-jsonschema>=0"
 
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
+do_check() {
+	: # Disable tests due to it downloading several deps
 }
+
 post_install() {
 	vlicense COPYING LICENSE
 }

Re: python3-jsonschema: update to 3.2.0

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26806#issuecomment-887996028

Comment:
Done in cb2d2a25f509fb069ff6307ec691ac72c02c02f0

Re: [PR PATCH] [Closed]: python3-jsonschema: update to 3.2.0

[ericonr]

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

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

python3-jsonschema: update to 3.2.0
https://github.com/void-linux/void-packages/pull/26806

Description:
Add missing deps to packages that depends on python3-jsonschema; the simple method would have been to add python3-attrs and python3-pyrsistent to python3-jsonschema depends but decided not to do it this way. 

Tested anki, docker-compose, synapse and gns3-gui after changes and they launch fine. 
While testing, attaching fix for gns3-sever as upon launch gns3server gives certain version of aiohttp is needed @the-maldridge