Skip to content

Commit a2cb229

Browse files
authored
Merge pull request #218 from lsst-sqre/tickets/DM-42967
DM-42967: Add setuptools as a dependency
2 parents 7ae0a07 + 1847636 commit a2cb229

File tree

6 files changed

+34
-23
lines changed

6 files changed

+34
-23
lines changed

.github/workflows/ci-cron.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ jobs:
1616
matrix:
1717
python-version:
1818
- "3.11"
19+
- "3.12"
1920
sphinx-version:
2021
- "7"
2122
- "dev"
2223

2324
steps:
24-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2526
with:
2627
fetch-depth: 0 # full history for setuptools_scm
2728

28-
- uses: actions/setup-node@v3
29+
- uses: actions/setup-node@v4
2930
with:
3031
node-version-file: '.nvmrc'
3132

@@ -51,26 +52,26 @@ jobs:
5152
runs-on: ubuntu-latest
5253

5354
steps:
54-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5556
with:
5657
fetch-depth: 0 # full history for setuptools_scm
5758

5859
- name: Build docs in tox
5960
uses: lsst-sqre/run-tox@v1
6061
with:
61-
python-version: "3.11"
62+
python-version: "3.12"
6263
tox-envs: "docs,docs-lint"
6364
use-cache: false
6465

6566
pypi:
6667
runs-on: ubuntu-latest
6768

6869
steps:
69-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7071
with:
7172
fetch-depth: 0 # full history for setuptools_scm
7273

73-
- uses: actions/setup-node@v3
74+
- uses: actions/setup-node@v4
7475
with:
7576
node-version-file: '.nvmrc'
7677

@@ -88,5 +89,5 @@ jobs:
8889
- name: Build and publish
8990
uses: lsst-sqre/build-and-publish-to-pypi@v2
9091
with:
91-
python-version: "3.11"
92+
python-version: "3.12"
9293
upload: false

.github/workflows/ci.yaml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
lint:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323

2424
- name: Set up Python
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
27-
python-version: '3.11'
27+
python-version: '3.12'
2828

2929
- name: Run pre-commit
30-
uses: pre-commit/action@v3.0.0
30+
uses: pre-commit/action@v3.0.1
3131

3232
test:
3333
runs-on: ubuntu-latest
@@ -36,15 +36,16 @@ jobs:
3636
matrix:
3737
python-version:
3838
- '3.11'
39+
- '3.12'
3940
sphinx-version:
4041
- '7'
4142

4243
steps:
43-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4445
with:
4546
fetch-depth: 0 # full history for setuptools_scm
4647

47-
- uses: actions/setup-node@v3
48+
- uses: actions/setup-node@v4
4849
with:
4950
cache: 'npm'
5051
node-version-file: '.nvmrc'
@@ -80,7 +81,7 @@ jobs:
8081
- name: Run tox
8182
uses: lsst-sqre/run-tox@v1
8283
with:
83-
python-version: '3.11'
84+
python-version: '3.12'
8485
tox-envs: 'docs,docs-lint'
8586

8687
# Only attempt documentation uploads for tagged releases and pull
@@ -102,14 +103,14 @@ jobs:
102103
runs-on: ubuntu-latest
103104

104105
steps:
105-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
106107
with:
107108
fetch-depth: 0 # full history for setuptools_scm
108109

109110
- name: Build and publish
110111
uses: lsst-sqre/build-and-publish-to-pypi@v2
111112
with:
112-
python-version: "3.11"
113+
python-version: "3.12"
113114
upload: "false"
114115

115116
pypi-publish:
@@ -124,11 +125,11 @@ jobs:
124125
if: github.event_name == 'release' && github.event.action == 'published'
125126

126127
steps:
127-
- uses: actions/checkout@v3
128+
- uses: actions/checkout@v4
128129
with:
129130
fetch-depth: 0 # full history for setuptools_scm
130131

131-
- uses: actions/setup-node@v3
132+
- uses: actions/setup-node@v4
132133
with:
133134
cache: 'npm'
134135
node-version-file: '.nvmrc'
@@ -141,4 +142,4 @@ jobs:
141142
- name: Build and publish
142143
uses: lsst-sqre/build-and-publish-to-pypi@v2
143144
with:
144-
python-version: '3.11'
145+
python-version: '3.12'

.github/workflows/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Run neophile
1717
uses: lsst-sqre/run-neophile@v1
1818
with:
19-
python-version: '3.11'
19+
python-version: '3.12'
2020
mode: pr
2121
types: pre-commit
2222
app-id: ${{ secrets.NEOPHILE_APP_ID }}

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
<!-- scriv-insert-here -->
44

5+
<a id='changelog-1.1.1'></a>
6+
## 1.1.1 (2024-02-21)
7+
8+
### Bug fixes
9+
10+
- `setuptools` is now included in the core package dependencies. The `documenteer.ext.bibtex` extension uses `pybtex`, which is turn uses `pkg_resources` from `setuptools`. In Python 3.12, setuptools is not available in Python environments by default. This direct dependency can be removed once `pybtex` is updated to use `importlib.metadata`.
11+
12+
### Other changes
13+
14+
- Update to the Python project configuration guide for `documenteer.toml` to use an example project other than "Documenteer" in the examples. Also emphasize the requirement that the project must be installed to use the `[project.python]` configuration in `documenteer.toml`.
15+
516
<a id='changelog-1.1.0'></a>
617
## 1.1.0 (2024-01-30)
718

changelog.d/20240213_094921_jsick_guide_examples.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies = [
3030
"requests",
3131
"click",
3232
"sphinxcontrib-bibtex>=2.0.0", # for pybtex extension
33+
"setuptools", # for pkg_resources, used by pybtex
3334
"pydantic >= 2.0.0",
3435
"urllib3",
3536
"pylatexenc",

0 commit comments

Comments
 (0)