Skip to content

Commit 7d9a8ae

Browse files
authored
setup.cfg: pin setuptools to version before 82 (#701)
This is needed because in version [82](https://setuptools.pypa.io/en/latest/history.html#v82-0-0), `pkg_resources` was removed. Also improve CI configuration/security a bit.
2 parents 859dcca + 3ee198f commit 7d9a8ae

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ updates:
55
labels: []
66
schedule:
77
interval: "weekly"
8+
cooldown:
9+
default-days: 7
810
- package-ecosystem: "pip"
911
directory: "/"
1012
labels: []
1113
schedule:
1214
interval: "weekly"
15+
cooldown:
16+
default-days: 7

.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555
steps:
5656
- name: Checkout repository
5757
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
58+
with:
59+
persist-credentials: false
5860

5961
# Initializes the CodeQL tools for scanning.
6062
- name: Initialize CodeQL

.github/workflows/tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
steps:
2121
- name: Repository checkout
2222
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
23+
with:
24+
persist-credentials: false
2325

2426
- name: Require GHA pinning
2527
uses: canonical/lxd/.github/actions/require-gha-pinning@main
@@ -54,6 +56,8 @@ jobs:
5456
steps:
5557
- name: Repository checkout
5658
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
59+
with:
60+
persist-credentials: false
5761

5862
- name: Install dependencies
5963
run: |
@@ -84,6 +88,8 @@ jobs:
8488
steps:
8589
- name: Repository checkout
8690
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
91+
with:
92+
persist-credentials: false
8793

8894
- name: Set up Python
8995
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ testing =
3535
requests-mock < 1.2
3636
# Python 3.12 no longer installs `setuptools` in venv
3737
# but mock-services depends on it for `pkg_resources`
38-
setuptools
38+
# `pkg_resources` was removed from `setuptools` 82 so pin an earlier version.
39+
setuptools < 82
3940
format =
4041
black
4142
flake8

0 commit comments

Comments
 (0)