[PR PATCH] salt: add contextvars dependency conditional

[PR PATCH] salt: add contextvars dependency conditional

[tsndqst]

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

Re: [PR PATCH] [Merged]: salt: remove contextvars dependency to fix 3003.3

[ericonr]

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

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

salt: remove contextvars dependency to fix 3003.3
https://github.com/void-linux/void-packages/pull/33331

Description:
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.

This is the error I got when running `salt` after upgrading to 3003.3.
```
Traceback (most recent call last):
  File "/usr/bin/salt", line 33, in <module>
    sys.exit(load_entry_point('salt==3003.3', 'console_scripts', 'salt')())
  File "/usr/lib/python3.9/site-packages/salt/scripts.py", line 533, in salt_main
    import salt.cli.salt
  File "/usr/lib/python3.9/site-packages/salt/cli/salt.py", line 6, in <module>
    import salt.utils.job
  File "/usr/lib/python3.9/site-packages/salt/utils/job.py", line 12, in <module>
    import salt.minion
  File "/usr/lib/python3.9/site-packages/salt/minion.py", line 23, in <module>
    import salt.beacons
  File "/usr/lib/python3.9/site-packages/salt/beacons/__init__.py", line 9, in <module>
    import salt.loader
  File "/usr/lib/python3.9/site-packages/salt/loader.py", line 26, in <module>
    import salt.config
  File "/usr/lib/python3.9/site-packages/salt/config/__init__.py", line 16, in <module>
    import salt.syspaths
  File "/usr/lib/python3.9/site-packages/salt/syspaths.py", line 21, in <module>
    import salt.utils.platform
  File "/usr/lib/python3.9/site-packages/salt/utils/platform.py", line 10, in <module>
    from salt.utils.decorators import memoize as real_memoize
  File "/usr/lib/python3.9/site-packages/salt/utils/decorators/__init__.py", line 19, in <module>
    import salt.utils.args
  File "/usr/lib/python3.9/site-packages/salt/utils/args.py", line 15, in <module>
    import salt.utils.versions
  File "/usr/lib/python3.9/site-packages/salt/utils/versions.py", line 30, in <module>
    import salt.version
  File "/usr/lib/python3.9/site-packages/salt/version.py", line 9, in <module>
    import salt.utils.entrypoints
  File "/usr/lib/python3.9/site-packages/salt/utils/entrypoints.py", line 36, in <module>
    import pkg_resources
  File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3243, in <module>
    def _initialize_master_working_set():
  File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3226, in _call_aside
    f(*args, **kwargs)
  File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3255, in _initialize_master_working_set
    working_set = WorkingSet._build_master()
  File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 568, in _build_master
    ws.require(__requires__)
  File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 886, in require
    needed = self.resolve(parse_requirements(requirements))
  File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 772, in resolve
    raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The 'contextvars' distribution was not found and is required by salt
```


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