Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] python3-frozendict: update to 2.0.7.
@ 2021-10-25 16:15 TinfoilSubmarine
  2021-10-27 13:25 ` [PR REVIEW] " ahesford
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: TinfoilSubmarine @ 2021-10-25 16:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages frozendict
https://github.com/void-linux/void-packages/pull/33744

python3-frozendict: update to 2.0.7.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Updating because latest version can successfully build C extension again. I had to patch out one test due to a segfault when testing in the chroot, but running the test in question on my machine succeeds. Not sure if I should file an issue about that here or in the package's upstream repo...

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

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

From 59130a356a3eff250cd9a1273bb347bf775e7148 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 24 Oct 2021 13:35:03 -0400
Subject: [PATCH] python3-frozendict: update to 2.0.7.

---
 .../python3-frozendict/patches/broken-test.patch   | 11 +++++++++++
 srcpkgs/python3-frozendict/patches/build-py.patch  | 13 -------------
 srcpkgs/python3-frozendict/template                | 14 ++++----------
 3 files changed, 15 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/python3-frozendict/patches/broken-test.patch
 delete mode 100644 srcpkgs/python3-frozendict/patches/build-py.patch

diff --git a/srcpkgs/python3-frozendict/patches/broken-test.patch b/srcpkgs/python3-frozendict/patches/broken-test.patch
new file mode 100644
index 000000000000..a335c91246c2
--- /dev/null
+++ b/srcpkgs/python3-frozendict/patches/broken-test.patch
@@ -0,0 +1,11 @@
+diff --git a/test/subclass_only.py b/test/subclass_only.py
+index 07b26e0..fb48bfd 100644
+--- a/test/subclass_only.py
++++ b/test/subclass_only.py
+@@ -1,6 +1,3 @@
+-def test_empty_sub(fd_empty):
+-    assert fd_empty == frozendict_class({}) == frozendict_class([]) == frozendict_class({}, **{})
+-
+ def test_constructor_self_sub(fd):
+     assert fd == frozendict_class(fd)
+ 
diff --git a/srcpkgs/python3-frozendict/patches/build-py.patch b/srcpkgs/python3-frozendict/patches/build-py.patch
deleted file mode 100644
index 4ec531e6aa66..000000000000
--- a/srcpkgs/python3-frozendict/patches/build-py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 462ee99..c287130 100755
---- a/setup.py
-+++ b/setup.py
-@@ -157,7 +157,7 @@ common_setup_args = dict(
-     keywords = keywords,
- )
- 
--custom_arg = None
-+custom_arg = "py"
- 
- if len(argv) > 1 and (argv[1] == "py" or argv[1] == "c_debug"):
-     custom_arg = argv[1]
diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 479b6b47a656..d8281a43c795 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.0.6
+version=2.0.7
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -12,14 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=3f00de72805cf4c9e81b334f3f04809278b967d2fed84552313a0fcce511beb1
+checksum=a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204
 
-pre_patch() {
-	# remove c implementation tests
-	cd test
-	rm c_only.py
-	rm test_frozendict_c.py
-	rm test_frozendict_c_subclass.py
-	rm test_coold.py
-	rm test_coold_subclass.py
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" pytest3
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR REVIEW] python3-frozendict: update to 2.0.7.
  2021-10-25 16:15 [PR PATCH] python3-frozendict: update to 2.0.7 TinfoilSubmarine
@ 2021-10-27 13:25 ` ahesford
  2021-10-27 13:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2021-10-27 13:25 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/33744#discussion_r737463904

Comment:
Drop the test patch and instead tell pytest to ignore what doesn't pass:
```sh
PYTHONPATH="$(cd build/lib* && pwd)" pytest3 -k 'not test_empty_sub'
```


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] python3-frozendict: update to 2.0.7.
  2021-10-25 16:15 [PR PATCH] python3-frozendict: update to 2.0.7 TinfoilSubmarine
  2021-10-27 13:25 ` [PR REVIEW] " ahesford
@ 2021-10-27 13:33 ` TinfoilSubmarine
  2021-10-27 13:34 ` [PR REVIEW] " TinfoilSubmarine
  2021-10-27 13:45 ` [PR PATCH] [Merged]: " ahesford
  3 siblings, 0 replies; 5+ messages in thread
From: TinfoilSubmarine @ 2021-10-27 13:33 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages frozendict
https://github.com/void-linux/void-packages/pull/33744

python3-frozendict: update to 2.0.7.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Updating because latest version can successfully build C extension again. I had to patch out one test due to a segfault when testing in the chroot, but running the test in question on my machine succeeds. Not sure if I should file an issue about that here or in the package's upstream repo...

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

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

From 9f45e22cf2ebb3fc8d12fd267b3675f3a22d664c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 24 Oct 2021 13:35:03 -0400
Subject: [PATCH] python3-frozendict: update to 2.0.7.

---
 srcpkgs/python3-frozendict/patches/build-py.patch | 13 -------------
 srcpkgs/python3-frozendict/template               | 14 ++++----------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-frozendict/patches/build-py.patch

diff --git a/srcpkgs/python3-frozendict/patches/build-py.patch b/srcpkgs/python3-frozendict/patches/build-py.patch
deleted file mode 100644
index 4ec531e6aa66..000000000000
--- a/srcpkgs/python3-frozendict/patches/build-py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 462ee99..c287130 100755
---- a/setup.py
-+++ b/setup.py
-@@ -157,7 +157,7 @@ common_setup_args = dict(
-     keywords = keywords,
- )
- 
--custom_arg = None
-+custom_arg = "py"
- 
- if len(argv) > 1 and (argv[1] == "py" or argv[1] == "c_debug"):
-     custom_arg = argv[1]
diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 479b6b47a656..6a478b3e1b5d 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.0.6
+version=2.0.7
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -12,14 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=3f00de72805cf4c9e81b334f3f04809278b967d2fed84552313a0fcce511beb1
+checksum=a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204
 
-pre_patch() {
-	# remove c implementation tests
-	cd test
-	rm c_only.py
-	rm test_frozendict_c.py
-	rm test_frozendict_c_subclass.py
-	rm test_coold.py
-	rm test_coold_subclass.py
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" pytest3 -k 'not test_empty_sub'
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR REVIEW] python3-frozendict: update to 2.0.7.
  2021-10-25 16:15 [PR PATCH] python3-frozendict: update to 2.0.7 TinfoilSubmarine
  2021-10-27 13:25 ` [PR REVIEW] " ahesford
  2021-10-27 13:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-27 13:34 ` TinfoilSubmarine
  2021-10-27 13:45 ` [PR PATCH] [Merged]: " ahesford
  3 siblings, 0 replies; 5+ messages in thread
From: TinfoilSubmarine @ 2021-10-27 13:34 UTC (permalink / raw)
  To: ml

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33744#discussion_r737473117

Comment:
I always forget about that option, thanks!

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: python3-frozendict: update to 2.0.7.
  2021-10-25 16:15 [PR PATCH] python3-frozendict: update to 2.0.7 TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2021-10-27 13:34 ` [PR REVIEW] " TinfoilSubmarine
@ 2021-10-27 13:45 ` ahesford
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2021-10-27 13:45 UTC (permalink / raw)
  To: ml

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

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

python3-frozendict: update to 2.0.7.
https://github.com/void-linux/void-packages/pull/33744

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Updating because latest version can successfully build C extension again. I had to patch out one test due to a segfault when testing in the chroot, but running the test in question on my machine succeeds. Not sure if I should file an issue about that here or in the package's upstream repo...

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-10-27 13:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 16:15 [PR PATCH] python3-frozendict: update to 2.0.7 TinfoilSubmarine
2021-10-27 13:25 ` [PR REVIEW] " ahesford
2021-10-27 13:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-27 13:34 ` [PR REVIEW] " TinfoilSubmarine
2021-10-27 13:45 ` [PR PATCH] [Merged]: " ahesford

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).