8000 meh · saltstack/salt@8711ff9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8711ff9

Browse files
dwozdwoz
committed
meh
1 parent 5a4184e commit 8711ff9

File tree

8 files changed

+57
-12
lines changed

8 files changed

+57
-12
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ jobs:
433433
with:
434434
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
435435
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
436-
relenv-version: "0.19.0"
436+
relenv-version: "0.19.2"
437437
python-version: "3.12.9"
438438
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
439439
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -448,7 +448,7 @@ jobs:
448448
with:
449449
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
450450
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
451-
relenv-version: "0.19.0"
451+
relenv-version: "0.19.2"
452452
python-version: "3.12.9"
453453
source: "onedir"
454454
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

‎.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ jobs:
486486
with:
487487
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
488488
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
489-
relenv-version: "0.19.0"
489+
relenv-version: "0.19.2"
490490
python-version: "3.12.9"
491491
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
492492
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -501,7 +501,7 @@ jobs:
501501
with:
502502
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
503503
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
504-
relenv-version: "0.19.0"
504+
relenv-version: "0.19.2"
505505
python-version: "3.12.9"
506506
source: "onedir"
507507
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -521,7 +521,7 @@ jobs:
521521
with:
522522
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
523523
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
524-
relenv-version: "0.19.0"
524+
relenv-version: "0.19.2"
525525
python-version: "3.12.9"
526526
source: "src"
527527
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

‎.github/workflows/scheduled.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ jobs:
476476
with:
477477
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
478478
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
479-
relenv-version: "0.19.0"
479+
relenv-version: "0.19.2"
480480
python-version: "3.12.9"
481481
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
482482
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -491,7 +491,7 @@ jobs:
491491
with:
492492
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
493493
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
494-
relenv-version: "0.19.0"
494+
relenv-version: "0.19.2"
495495
python-version: "3.12.9"
496496
source: "onedir"
497497
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

‎.github/workflows/staging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ jobs:
473473
with:
474474
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
475475
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
476-
relenv-version: "0.19.0"
476+
relenv-version: "0.19.2"
477477
python-version: "3.12.9"
478478 628C
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
479479
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -489,7 +489,7 @@ jobs:
489489
with:
490490
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
491491
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
492-
relenv-version: "0.19.0"
492+
relenv-version: "0.19.2"
493493
python-version: "3.12.9"
494494
source: "onedir"
495495
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -510,7 +510,7 @@ jobs:
510510
with:
511511
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
512512
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
513-
relenv-version: "0.19.0"
513+
relenv-version: "0.19.2"
514514
python-version: "3.12.9"
515515
source: "src"
516516
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}

‎cicd/shared-gh-workflows-context.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
nox_version: "2022.8.7"
22
python_version: "3.12.9"
3-
relenv_version: "0.19.0"
3+
relenv_version: "0.19.2"
44
release_branches:
55
- "3006.x"
66
- "3007.x"

‎requirements.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
aiohttp==3.8.1
2+
aiosignal==1.2.0
3+
async-timeout==4.0.1
4+
certifi==2020.6.20
5+
cffi==1.15.0
6+
charset-normalizer==2.0.6
7+
cheroot==8.5.2
8+
croniter==1.0.15
9+
cryptography==3.4.8
10+
distro==1.7.0
11+
frozenlist==1.2.0
12+
idna==3.3
13+
importlib-metadata==4.6.4
14+
jaraco.collections==3.4.0
15+
jaraco.functools==3.4.0
16+
jaraco.text==3.6.0
17+
jinja2==3.0.3
18+
jmespath==0.10.0
19+
markupsafe==2.0.1
20+
more-itertools==8.10.0
21+
msgpack==1.0.3
22+
multidict==5.1.0
23+
packaging==21.3
24+
portend==3.0.0
25+
psutil==5.9.0
26+
pycparser==2.21
27+
pycryptodomex==3.11.0
28+
pyopenssl==21.0.0
29+
python-dateutil==2.8.1
30+
python-gnupg==0.4.8
31+
pytz==2022.1
32+
pyyaml==5.4.1
33+
pyzmq==22.3.0
34+
requests==2.25.1
35+
setproctitle==1.2.2
36+
six==1.16.0
37+
tempora==4.1.2
38+
tornado==6.1.0
39+
urllib3==1.26.5
40+
yarl==1.7.2
41+
zc.lockfile==2.0
42+
zipp==1.0.0

‎requirements/static/ci/darwin.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--constraint=../pkg/py{py_version}/{platform}.txt
22

3-
pygit2>=1.10.1
3+
pygit2>=1.10.1 ; python_version < '3.12'
4+
pygit2>=1.15.0 ; python_version >= '3.12'
45
yamllint
56
mercurial
67
hglib

‎tools/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
CI_REQUIREMENTS_FILES_PATH / "tools-virustotal.txt",
2828
],
2929
add_as_extra_site_packages=True,
30+
pip_requirement="pip>=25",
31+
setuptools_requirement="setuptools>=71.0.0",
3032
)
3133
ptscripts.set_default_config(DEFAULT_REQS_CONFIG)
3234
ptscripts.register_tools_module("tools.changelog")

0 commit comments

Comments
 (0)
0