Skip to content

Commit

Permalink
Merge pull request #857 from swyddfa/develop
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
alcarney authored Jul 19, 2024
2 parents 6ed84af + 9290cef commit c342964
Show file tree
Hide file tree
Showing 89 changed files with 2,058 additions and 865 deletions.
3 changes: 3 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
// "build": {
// "dockerfile": "Dockerfile"
// },
"containerEnv": {
"TZ": "UTC"
},
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- name: Build and push Docker image
id: push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .devcontainer/
push: ${{ github.event_name != 'pull_request' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lsp-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
lsp: ${{steps.check-lsp.outputs.build}}
code: ${{steps.check-code.outputs.build}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.env
.ipynb_checkpoints
.tox
.vscode/extensions/esbonio
.vscode-test

*.pyc
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.7
rev: v0.5.2
hooks:
- id: ruff
args: [--fix]

- id: ruff-format

- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v1.10.0'
rev: 'v1.10.1'
hooks:
- id: mypy
name: mypy (scripts)
Expand Down
9 changes: 1 addition & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter",
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
Expand All @@ -12,9 +12,6 @@
"[typescript]": {
"editor.tabSize": 2
},
"files.associations": {
"setup.cfg": "ini",
},
"files.exclude": {
"**/.git": true,
"**/.svn": true,
Expand All @@ -32,10 +29,6 @@
"**/.mypy_cache": true
},
"esbonio.server.showDeprecationWarnings": true,
"isort.args": [
"--settings-file",
"./lib/esbonio/pyproject.toml"
],
"python.testing.pytestArgs": [
"lib/esbonio/tests"
],
Expand Down
6 changes: 5 additions & 1 deletion code/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include ../.devcontainer/tools.mk

ESBONIO ?= --pre esbonio

.PHONY: dist dev-deps release-deps release
.PHONY: dist dev-deps release-deps release install

watch: dev-deps $(NPM)
-test -d dist && rm -r dist
Expand All @@ -12,6 +12,10 @@ compile: dev-deps $(NPM)
-test -d dist && rm -r dist
$(NPM) run compile

install: compile
-test -d ../.vscode/extensions || mkdir -p ../.vscode/extensions
test -L ../.vscode/extensions/esbonio || ln -s $(PWD) ../.vscode/extensions/esbonio

dist: release-deps $(NPM)
-test -d dist && rm -r dist
$(NPM) run package
Expand Down
4 changes: 4 additions & 0 deletions code/changes/854.feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Add a "Sphinx Processes" tree view

The tree view shows the current status of Sphinx sub-processes as well as providing a place from which to control them.
Currently there is just one command that can be used to restart a given process
1 change: 1 addition & 0 deletions code/changes/854.misc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Removed Language Status Items
1 change: 1 addition & 0 deletions code/changes/857.misc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update bundled version of the language server to `v1.0.0b6`
Loading

0 comments on commit c342964

Please sign in to comment.