Skip to content

Commit e0aea03

Browse files
datakurredatakurre
committed
ci: Add Python 312 and Sphinx 9.0.0
1 parent 6eb9411 commit e0aea03

10 files changed

Lines changed: 1248 additions & 1340 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,9 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python: [python39, python310, python311]
12-
sphinx: [8.2.3, 8.1.3, 8.0.2, 7.4.7]
11+
python: [python310, python311, python312]
12+
sphinx: [9.0.0, 8.2.3, 8.1.3, 8.0.2, 7.4.7]
1313
exclude:
14-
- python: python39
15-
sphinx: 8.2.3
16-
- python: python39
17-
sphinx: 8.1.3
18-
- python: python39
19-
sphinx: 8.0.2
2014
- python: python310
2115
sphinx: 8.2.3
2216
- python: python310
@@ -29,6 +23,12 @@ jobs:
2923
sphinx: 8.0.2
3024
- python: python311
3125
sphinx: 7.4.7
26+
- python: python312
27+
sphinx: 8.1.3
28+
- python: python312
29+
sphinx: 8.0.2
30+
- python: python312
31+
sphinx: 7.4.7
3232
steps:
3333
- uses: actions/checkout@v4
3434
- uses: cachix/install-nix-action@v30
@@ -45,4 +45,4 @@ jobs:
4545
with:
4646
debug: true
4747
format: cobertura
48-
github-token: ${{ secrets.GITHUB_TOKEN }}
48+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ coverage: coverage.xml
4848

4949
.PHONY: test\ all
5050
test\ all: ## Test all supported versions
51-
make PYTHON=python311 SPHINX=8.2.3 clean devenv-show devenv-test
51+
make PYTHON=python312 SPHINX=8.2.3 clean devenv-show devenv-test
5252
#make PYTHON=python311 SPHINX=8.1.3 clean devenv-show devenv-test
5353
#make PYTHON=python311 SPHINX=8.0.2 clean devenv-show devenv-test
5454
#make PYTHON=python311 SPHINX=7.4.7 clean devenv-show devenv-test
@@ -57,7 +57,7 @@ test\ all: ## Test all supported versions
5757
#make PYTHON=python310 SPHINX=8.0.2 clean devenv-show devenv-test
5858
#make PYTHON=python310 SPHINX=7.4.7 clean devenv-show devenv-test
5959

60-
make PYTHON=python39 SPHINX=7.4.7 clean devenv-show devenv-test
60+
make PYTHON=python311 SPHINX=7.4.7 clean devenv-show devenv-test
6161

6262
devenv.local.nix:
6363
@echo '{ pkgs, ...}: { languages.python = { interpreter = pkgs.$(PYTHON); dependencies = [ "sphinx$(subst .,,$(SPHINX))" "dev" ]; }; }' > devenv.local.nix

‎devenv.lock‎

Lines changed: 18 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"devenv": {
44
"locked": {
55
"dir": "src/modules",
6-
"lastModified": 1743025451,
6+
"lastModified": 1764449550,
77
"owner": "cachix",
88
"repo": "devenv",
9-
"rev": "686aaf88c9c095fc49dadc620d1a814830c78206",
9+
"rev": "dfb58ac03bed07b93f629df55034bc50394d3971",
1010
"type": "github"
1111
},
1212
"original": {
@@ -19,10 +19,10 @@
1919
"flake-compat": {
2020
"flake": false,
2121
"locked": {
22-
"lastModified": 1733328505,
22+
"lastModified": 1761588595,
2323
"owner": "edolstra",
2424
"repo": "flake-compat",
25-
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
25+
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
2626
"type": "github"
2727
},
2828
"original": {
@@ -31,23 +31,6 @@
3131
"type": "github"
3232
}
3333
},
34-
"flake-utils": {
35-
"inputs": {
36-
"systems": "systems"
37-
},
38-
"locked": {
39-
"lastModified": 1731533236,
40-
"owner": "numtide",
41-
"repo": "flake-utils",
42-
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
43-
"type": "github"
44-
},
45-
"original": {
46-
"owner": "numtide",
47-
"repo": "flake-utils",
48-
"type": "github"
49-
}
50-
},
5134
"git-hooks": {
5235
"inputs": {
5336
"flake-compat": "flake-compat",
@@ -57,10 +40,10 @@
5740
]
5841
},
5942
"locked": {
60-
"lastModified": 1742649964,
43+
"lastModified": 1763988335,
6144
"owner": "cachix",
6245
"repo": "git-hooks.nix",
63-
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
46+
"rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
6447
"type": "github"
6548
},
6649
"original": {
@@ -77,10 +60,10 @@
7760
]
7861
},
7962
"locked": {
80-
"lastModified": 1709087332,
63+
"lastModified": 1762808025,
8164
"owner": "hercules-ci",
8265
"repo": "gitignore.nix",
83-
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
66+
"rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
8467
"type": "github"
8568
},
8669
"original": {
@@ -89,50 +72,17 @@
8972
"type": "github"
9073
}
9174
},
92-
"nix-vscode-extensions": {
93-
"inputs": {
94-
"flake-utils": "flake-utils",
95-
"nixpkgs": "nixpkgs"
96-
},
97-
"locked": {
98-
"lastModified": 1743126894,
99-
"owner": "nix-community",
100-
"repo": "nix-vscode-extensions",
101-
"rev": "2473e00df450ad863f552f2cc8da78e6a942118d",
102-
"type": "github"
103-
},
104-
"original": {
105-
"owner": "nix-community",
106-
"repo": "nix-vscode-extensions",
107-
"type": "github"
108-
}
109-
},
11075
"nixpkgs": {
11176
"locked": {
112-
"lastModified": 1740547748,
113-
"owner": "NixOS",
114-
"repo": "nixpkgs",
115-
"rev": "3a05eebede89661660945da1f151959900903b6a",
116-
"type": "github"
117-
},
118-
"original": {
119-
"owner": "NixOS",
120-
"repo": "nixpkgs",
121-
"rev": "3a05eebede89661660945da1f151959900903b6a",
122-
"type": "github"
123-
}
124-
},
125-
"nixpkgs_2": {
126-
"locked": {
127-
"lastModified": 1742937945,
77+
"lastModified": 1764316264,
12878
"owner": "nixos",
12979
"repo": "nixpkgs",
130-
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
80+
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
13181
"type": "github"
13282
},
13383
"original": {
13484
"owner": "nixos",
135-
"ref": "nixos-24.11",
85+
"ref": "nixos-25.05",
13686
"repo": "nixpkgs",
13787
"type": "github"
13888
}
@@ -150,10 +100,10 @@
150100
]
151101
},
152102
"locked": {
153-
"lastModified": 1742689179,
103+
"lastModified": 1763662255,
154104
"owner": "pyproject-nix",
155105
"repo": "build-system-pkgs",
156-
"rev": "5c2a1faadc4015d50eb9919a8e20c112f3765fc2",
106+
"rev": "042904167604c681a090c07eb6967b4dd4dae88c",
157107
"type": "github"
158108
},
159109
"original": {
@@ -169,10 +119,10 @@
169119
]
170120
},
171121
"locked": {
172-
"lastModified": 1743085397,
122+
"lastModified": 1764134915,
173123
"owner": "pyproject-nix",
174124
"repo": "pyproject.nix",
175-
"rev": "af4c3ccf8cffcd49626b0455defb0f6b22cc1910",
125+
"rev": "2c8df1383b32e5443c921f61224b198a2282a657",
176126
"type": "github"
177127
},
178128
"original": {
@@ -185,8 +135,7 @@
185135
"inputs": {
186136
"devenv": "devenv",
187137
"git-hooks": "git-hooks",
188-
"nix-vscode-extensions": "nix-vscode-extensions",
189-
"nixpkgs": "nixpkgs_2",
138+
"nixpkgs": "nixpkgs",
190139
"pre-commit-hooks": [
191140
"git-hooks"
192141
],
@@ -195,20 +144,6 @@
195144
"uv2nix": "uv2nix"
196145
}
197146
},
198-
"systems": {
199-
"locked": {
200-
"lastModified": 1681028828,
201-
"owner": "nix-systems",
202-
"repo": "default",
203-
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
204-
"type": "github"
205-
},
206-
"original": {
207-
"owner": "nix-systems",
208-
"repo": "default",
209-
"type": "github"
210-
}
211-
},
212147
"uv2nix": {
213148
"inputs": {
214149
"nixpkgs": [
@@ -219,10 +154,10 @@
219154
]
220155
},
221156
"locked": {
222-
"lastModified": 1743121517,
157+
"lastModified": 1764546642,
223158
"owner": "pyproject-nix",
224159
"repo": "uv2nix",
225-
"rev": "f216d9d37805b1414141ee7795e988c05c95d595",
160+
"rev": "0c56de7543459a23d0ebb7977fd555ced5d842ae",
226161
"type": "github"
227162
},
228163
"original": {

‎devenv.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs, ... }:
22
{
33
imports = [
4-
./devenv/modules/python.nix
4+
./devenv.uv2nix.nix
55
];
66

77
languages.python.pyprojectOverrides = final: prev: {

devenv/modules/python.nix renamed to devenv.uv2nix.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ in
4242
};
4343
dependencies = mkOption {
4444
default = [
45+
"rf711"
4546
"dev"
4647
];
4748
type = types.listOf types.str;
4849
};
4950
workspaceRoot = mkOption {
5051
type = types.path;
51-
default = ../../.;
52+
default = ./.;
5253
};
5354
pyprojectName = mkOption {
5455
type = types.str;

‎devenv.yaml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
21
inputs:
32
nixpkgs:
4-
url: github:nixos/nixpkgs/nixos-24.11
5-
nix-vscode-extensions:
6-
url: github:nix-community/nix-vscode-extensions
3+
url: github:nixos/nixpkgs/nixos-25.05
74
pyproject-nix:
85
url: github:pyproject-nix/pyproject.nix
96
inputs:
@@ -25,15 +22,4 @@ inputs:
2522
follows: pyproject-nix
2623
uv2nix:
2724
follows: uv2nix
28-
29-
# If you're using non-OSS software, you can set allowUnfree to true.
3025
allowUnfree: true
31-
# "vscode-extension-ms-vscode-remote-remote-containers"
32-
33-
# If you're willing to use a package that's vulnerable
34-
# permittedInsecurePackages:
35-
# - "openssl-1.1.1w"
36-
37-
# If you have more than one devenv you can merge them
38-
#imports:
39-
# - ./backend

‎devenv/modules/vscode.nix‎

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

‎docs/conf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
#
32
# sphinxcontrib-httpexample documentation build configuration file, created by
43
# sphinx-quickstart on Fri Mar 3 12:29:43 2017.
@@ -31,21 +30,22 @@
3130
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
3231
# ones.
3332
extensions = [
34-
"sphinx_design",
33+
# "sphinx_design",
3534
"sphinx_inline_tabs",
3635
"sphinxcontrib.httpdomain",
3736
"sphinxcontrib.httpexample",
3837
]
3938

4039
try:
4140
import sphinx_copybutton
42-
import sphinx_design
41+
42+
# import sphinx_design
4343
import sphinx_inline_tabs
4444

4545
extensions.extend(
4646
[
4747
"sphinx_copybutton",
48-
"sphinx_design",
48+
# "sphinx_design",
4949
"sphinx_inline_tabs",
5050
]
5151
)

0 commit comments

Comments
 (0)