Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] salt: add contextvars dependency conditional
@ 2021-10-05  2:25 tsndqst
  2021-10-07  2:31 ` [PR PATCH] [Merged]: salt: remove contextvars dependency to fix 3003.3 ericonr
  0 siblings, 1 reply; 2+ messages in thread
From: tsndqst @ 2021-10-05  2:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tsndqst/void-packages salt-contextvars
https://github.com/void-linux/void-packages/pull/33331

salt: add contextvars dependency conditional
The recent update to 3003.3 broke the `salt` package.  This PR intends to fix it.
A description of the issue is in the saltstack repo https://github.com/saltstack/salt/issues/60483

tldr: contextvars is included in recent versions of python.

<!-- 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
-->


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

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

From 41f280427ced6bc986ca861852d9d6435f05cb1c Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 4 Oct 2021 21:15:30 -0500
Subject: [PATCH] salt: add contextvars dependency conditional

See https://github.com/saltstack/salt/issues/60483
---
 srcpkgs/salt/patches/requirements.patch | 6 ++++++
 srcpkgs/salt/template                   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/salt/patches/requirements.patch

diff --git a/srcpkgs/salt/patches/requirements.patch b/srcpkgs/salt/patches/requirements.patch
new file mode 100644
index 000000000000..8b1217a30c44
--- /dev/null
+++ b/srcpkgs/salt/patches/requirements.patch
@@ -0,0 +1,6 @@
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -6,2 +6,2 @@
+ distro>=1.0.1
+-contextvars
++contextvars; python_version < "3.7"
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 7e9f1f7a140e..8959d4f90018 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,7 +1,7 @@
 # Template file for 'salt'
 pkgname=salt
 version=3003.3
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq

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

end of thread, other threads:[~2021-10-07  2:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05  2:25 [PR PATCH] salt: add contextvars dependency conditional tsndqst
2021-10-07  2:31 ` [PR PATCH] [Merged]: salt: remove contextvars dependency to fix 3003.3 ericonr

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