Skip to content

Commit 71965e9

Browse files
alcarneyalcarney
authored
Merge pull request #1040 from swyddfa/develop
Release v1.0
2 parents a8b1820 + 01621aa commit 71965e9

File tree

89 files changed

+3068
-2686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+3068
-2686
lines changed

‎.devcontainer/tools.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ifeq ($(strip $(ARCH)),)
55
$(error Unable to determine platform architecture)
66
endif
77

8-
NODE_VERSION := 20.19.3
9-
UV_VERSION := 0.7.15
8+
NODE_VERSION := 20.19.5
9+
UV_VERSION := 0.8.22
1010

1111
UV ?= $(shell command -v uv)
1212
UVX ?= $(shell command -v uvx)
@@ -32,7 +32,7 @@ $(UV):
3232
endif
3333

3434
# The versions of Python we support
35-
PYXX_versions := 3.9 3.10 3.11 3.12 3.13 3.14
35+
PYXX_versions := 3.10 3.11 3.12 3.13 3.14
3636

3737
# Our default Python version
3838
PY_VERSION := 3.13
@@ -64,9 +64,9 @@ ifeq ($$(strip $$(PY$(subst .,,$1))),)
6464
PY$(subst .,,$1) := $$(BIN)/python$1
6565

6666
$$(PY$(subst .,,$1)): | $$(UV)
67-
$$(UV) python find $1 || $$(UV) python install $1
68-
ln -s $$$$($$(UV) python find $1) $$@
69-
67+
$$(UV) python find $1 > /dev/null || $$(UV) python install $1
68+
# Sometimes uv links the executable on install... sometimes it doesn't?
69+
test -f $$@ || ln -s $$$$($$(UV) python find $1) $$@
7070
$$@ --version
7171

7272
endif

‎.github/dependabot.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,37 @@ updates:
1010
target-branch: "develop"
1111
schedule:
1212
interval: "monthly"
13+
groups:
14+
actions:
15+
patterns:
16+
- "*"
1317

1418
- package-ecosystem: "npm"
1519
directory: "/code"
1620
target-branch: "develop"
1721
schedule:
1822
interval: "monthly"
23+
groups:
24+
vscode-ext:
25+
patterns:
26+
- "*"
27+
28+
- package-ecosystem: "pip"
29+
directory: "/code"
30+
target-branch: "develop"
31+
schedule:
32+
interval: "monthly"
33+
groups:
34+
vscode-envs:
35+
patterns:
36+
- "*"
1937

2038
- package-ecosystem: "pip"
2139
directory: "/lib/esbonio/tests/workspaces/demo"
2240
target-branch: "develop"
2341
schedule:
2442
interval: "monthly"
43+
groups:
44+
demo-docs:
45+
patterns:
46+
- "*"

‎.github/workflows/automation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
name: Issue Automation
1515
steps:
16-
- uses: 'actions/checkout@v4'
16+
- uses: 'actions/checkout@v5'
1717

1818
- name: Run Script
1919
env:

‎.github/workflows/devenv.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout repository
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
3232

3333
- name: Set up Docker Buildx
3434
uses: docker/setup-buildx-action@v3

‎.github/workflows/lsp-pr.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Setup Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: "3.11"
2020

@@ -46,14 +46,14 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
49+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
5050
os: [ubuntu-latest, windows-latest]
5151

5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454

5555
- name: Setup Python ${{ matrix.python-version }}
56-
uses: actions/setup-python@v5
56+
uses: actions/setup-python@v6
5757
with:
5858
python-version: ${{ matrix.python-version }}
5959
allow-prereleases: true

‎.github/workflows/lsp-release.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
lsp: ${{steps.check-lsp.outputs.build}}
1515
code: ${{steps.check-code.outputs.build}}
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
2020

@@ -57,9 +57,9 @@ jobs:
5757
id-token: write
5858

5959
steps:
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6161

62-
- uses: actions/setup-python@v5
62+
- uses: actions/setup-python@v6
6363
with:
6464
python-version: "3.10"
6565

@@ -110,18 +110,18 @@ jobs:
110110
(needs.lsp-release.result == 'success' || needs.lsp-release.result == 'skipped')
111111
runs-on: ubuntu-latest
112112
steps:
113-
- uses: 'actions/checkout@v4'
113+
- uses: 'actions/checkout@v5'
114114

115-
- uses: 'actions/setup-node@v4'
115+
- uses: 'actions/setup-node@v5'
116116
with:
117117
node-version: 20.x
118118
cache: 'npm'
119119
cache-dependency-path: 'code/package-lock.json'
120120

121-
- uses: 'actions/setup-python@v5'
121+
- uses: 'actions/setup-python@v6'
122122
with:
123123
# This must be the minimum Python version we support
124-
python-version: "3.9"
124+
python-version: "3.10"
125125

126126
- name: pip cache
127127
uses: actions/cache@v4
@@ -147,7 +147,7 @@ jobs:
147147
cd code
148148
149149
# Use version of esbonio on PyPi for release builds
150-
ESBONIO_WHL="--pre esbonio" make dist
150+
ESBONIO_WHL="esbonio" make dist
151151
name: Package Extension
152152
153153
- name: 'Upload Artifact'
@@ -174,15 +174,15 @@ jobs:
174174
environment:
175175
name: vscode-marketplace
176176
steps:
177-
- uses: 'actions/checkout@v4'
177+
- uses: 'actions/checkout@v5'
178178

179-
- uses: 'actions/setup-node@v4'
179+
- uses: 'actions/setup-node@v5'
180180
with:
181181
node-version: 20.x
182182
cache: 'npm'
183183
cache-dependency-path: 'code/package-lock.json'
184184

185-
- uses: actions/download-artifact@v4
185+
- uses: actions/download-artifact@v5
186186
name: 'Download Extension'
187187
with:
188188
name: 'vsix'
@@ -204,15 +204,15 @@ jobs:
204204
environment:
205205
name: open-vsx
206206
steps:
207-
- uses: 'actions/checkout@v4'
207+
- uses: 'actions/checkout@v5'
208208

209-
- uses: 'actions/setup-node@v4'
209+
- uses: 'actions/setup-node@v5'
210210
with:
211211
node-version: 20.x
212212
cache: 'npm'
213213
cache-dependency-path: 'code/package-lock.json'
214214

215-
- uses: actions/download-artifact@v4
215+
- uses: actions/download-artifact@v5
216216
name: 'Download Extension'
217217
with:
218218
name: 'vsix'

‎.github/workflows/sphinx-ext-pr.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Setup Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: "3.11"
2020

@@ -51,10 +51,10 @@ jobs:
5151
matrix:
5252
python-version: ["3.9", "3.10", "3.11", "3.12"]
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555

5656
- name: Setup Python ${{ matrix.python-version }}
57-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5858
with:
5959
python-version: ${{ matrix.python-version }}
6060

‎.github/workflows/sphinx-ext-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
id-token: write
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

23-
- uses: actions/setup-python@v5
23+
- uses: actions/setup-python@v6
2424
with:
2525
python-version: "3.11"
2626

‎.github/workflows/vscode-pr.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: 'actions/checkout@v4'
14+
- uses: 'actions/checkout@v5'
1515

16-
- uses: 'actions/setup-node@v4'
16+
- uses: 'actions/setup-node@v5'
1717
with:
1818
node-version: 20.x
1919
cache: 'npm'
2020
cache-dependency-path: 'code/package-lock.json'
2121

22-
- uses: 'actions/setup-python@v5'
22+
- uses: 'actions/setup-python@v6'
2323
with:
2424
# This must be the minimum Python version we support
25-
python-version: "3.9"
25+
python-version: "3.10"
2626

2727
- name: Pip cache
2828
uses: actions/cache@v4
@@ -72,29 +72,35 @@ jobs:
7272
test:
7373
name: "Python v${{ matrix.python-version }}"
7474
runs-on: ubuntu-latest
75+
# container:
76+
# image: ghcr.io/swyddfa/esbonio-devenv
77+
# credentials:
78+
# username: ${{ github.actor }}
79+
# password: ${{ secrets.github_token }}
80+
7581
timeout-minutes: 20
7682
strategy:
7783
fail-fast: false
7884
matrix:
79-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
85+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
8086

8187
steps:
82-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v5
8389

84-
- uses: 'actions/setup-node@v4'
90+
- uses: 'actions/setup-node@v5'
8591
with:
8692
node-version: 20.x
8793
cache: 'npm'
8894
cache-dependency-path: 'code/package-lock.json'
8995

9096
- name: Setup Python ${{ matrix.python-version }}
91-
uses: actions/setup-python@v5
97+
uses: actions/setup-python@v6
9298
with:
9399
python-version: ${{ matrix.python-version }}
94100
allow-prereleases: true
95101

96102
- run: |
97-
cd code/
103+
cd code
98104
make dev-deps
99105
npx tsc -p .
100106

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ ci:
44
repos:
55

66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v5.0.0
7+
rev: v6.0.0
88
hooks:
99
- id: check-yaml
1010
- id: end-of-file-fixer
1111
- id: trailing-whitespace
1212

1313
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.11.4
14+
rev: v0.13.3
1515
hooks:
1616
- id: ruff
1717
name: ruff (esbonio)
18-
args: [--fix]
18+
args: [--fix, --output-format, concise]
1919
files: 'lib/esbonio/.*\.py'
2020

2121
- id: ruff
2222
name: ruff (esbonio-extensions)
23-
args: [--fix]
23+
args: [--fix, --output-format, concise]
2424
files: 'lib/esbonio-extensions/.*\.py'
2525

2626
- id: ruff-format
@@ -32,7 +32,7 @@ repos:
3232
files: 'lib/esbonio-extensions/.*\.py'
3333

3434
- repo: https://github.com/pre-commit/mirrors-mypy
35-
rev: 'v1.15.0'
35+
rev: 'v1.18.2'
3636
hooks:
3737
- id: mypy
3838
name: mypy (scripts)

0 commit comments

Comments
 (0)