Skip to content

Commit c278cb9

Browse files
authored
CI Cleanup (#316)
1 parent 92e7325 commit c278cb9

File tree

4 files changed

+33
-32
lines changed

4 files changed

+33
-32
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
run: |
103103
pip install -e .
104104
- name: Check Release
105-
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
105+
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
106106
with:
107107
token: ${{ secrets.GITHUB_TOKEN }}
108108

@@ -119,7 +119,7 @@ jobs:
119119
- name: Install miniumum versions
120120
uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
121121
- name: Run the unit tests
122-
run: python -m pytest -vv -raXs || python -m pytest -vv -raXs --lf
122+
run: python -m pytest -vv -raXs -W default || python -m pytest -vv -raXs -W default --lf
123123

124124
test_prereleases:
125125
name: Test Prereleases

.pre-commit-config.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,16 @@ repos:
2828
files: \.py$
2929
args: [--profile=black]
3030

31-
- repo: https://github.com/pre-commit/mirrors-prettier
32-
rev: v2.7.1
31+
- repo: https://github.com/abravalheri/validate-pyproject
32+
rev: v0.10.1
3333
hooks:
34-
- id: prettier
35-
exclude: "jupyterlab_server/templates/.*.html"
34+
- id: validate-pyproject
35+
stages: [manual]
36+
37+
- repo: https://github.com/executablebooks/mdformat
38+
rev: 0.7.16
39+
hooks:
40+
- id: mdformat
3641

3742
- repo: https://github.com/asottile/pyupgrade
3843
rev: v3.0.0

CHANGELOG.md

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
---
2-
github_url: "https://github.com/jupyterlab/jupyterlab_server/blob/master/CHANGELOG.md"
3-
---
4-
51
# Change Log
62

73
<!-- <START NEW CHANGELOG ENTRY> -->
@@ -16,8 +12,8 @@ github_url: "https://github.com/jupyterlab/jupyterlab_server/blob/master/CHANGEL
1612

1713
### Maintenance and upkeep improvements
1814

19-
- [pre-commit.ci] pre-commit autoupdate [#301](https://github.com/jupyterlab/jupyterlab_server/pull/301) ([@pre-commit-ci](https://github.com/pre-commit-ci))
20-
- [pre-commit.ci] pre-commit autoupdate [#300](https://github.com/jupyterlab/jupyterlab_server/pull/300) ([@pre-commit-ci](https://github.com/pre-commit-ci))
15+
- \[pre-commit.ci\] pre-commit autoupdate [#301](https://github.com/jupyterlab/jupyterlab_server/pull/301) ([@pre-commit-ci](https://github.com/pre-commit-ci))
16+
- \[pre-commit.ci\] pre-commit autoupdate [#300](https://github.com/jupyterlab/jupyterlab_server/pull/300) ([@pre-commit-ci](https://github.com/pre-commit-ci))
2117

2218
### Contributors to this release
2319

@@ -34,13 +30,13 @@ github_url: "https://github.com/jupyterlab/jupyterlab_server/blob/master/CHANGEL
3430
### Maintenance and upkeep improvements
3531

3632
- Add fix license header job [#298](https://github.com/jupyterlab/jupyterlab_server/pull/298) ([@fcollonval](https://github.com/fcollonval))
37-
- [pre-commit.ci] pre-commit autoupdate [#297](https://github.com/jupyterlab/jupyterlab_server/pull/297) ([@pre-commit-ci](https://github.com/pre-commit-ci))
33+
- \[pre-commit.ci\] pre-commit autoupdate [#297](https://github.com/jupyterlab/jupyterlab_server/pull/297) ([@pre-commit-ci](https://github.com/pre-commit-ci))
3834
- Ignore deprecationwarning from jsonschema [#295](https://github.com/jupyterlab/jupyterlab_server/pull/295) ([@blink1073](https://github.com/blink1073))
39-
- [pre-commit.ci] pre-commit autoupdate [#294](https://github.com/jupyterlab/jupyterlab_server/pull/294) ([@pre-commit-ci](https://github.com/pre-commit-ci))
40-
- [pre-commit.ci] pre-commit autoupdate [#293](https://github.com/jupyterlab/jupyterlab_server/pull/293) ([@pre-commit-ci](https://github.com/pre-commit-ci))
41-
- [pre-commit.ci] pre-commit autoupdate [#291](https://github.com/jupyterlab/jupyterlab_server/pull/291) ([@pre-commit-ci](https://github.com/pre-commit-ci))
42-
- [pre-commit.ci] pre-commit autoupdate [#290](https://github.com/jupyterlab/jupyterlab_server/pull/290) ([@pre-commit-ci](https://github.com/pre-commit-ci))
43-
- [pre-commit.ci] pre-commit autoupdate [#289](https://github.com/jupyterlab/jupyterlab_server/pull/289) ([@pre-commit-ci](https://github.com/pre-commit-ci))
35+
- \[pre-commit.ci\] pre-commit autoupdate [#294](https://github.com/jupyterlab/jupyterlab_server/pull/294) ([@pre-commit-ci](https://github.com/pre-commit-ci))
36+
- \[pre-commit.ci\] pre-commit autoupdate [#293](https://github.com/jupyterlab/jupyterlab_server/pull/293) ([@pre-commit-ci](https://github.com/pre-commit-ci))
37+
- \[pre-commit.ci\] pre-commit autoupdate [#291](https://github.com/jupyterlab/jupyterlab_server/pull/291) ([@pre-commit-ci](https://github.com/pre-commit-ci))
38+
- \[pre-commit.ci\] pre-commit autoupdate [#290](https://github.com/jupyterlab/jupyterlab_server/pull/290) ([@pre-commit-ci](https://github.com/pre-commit-ci))
39+
- \[pre-commit.ci\] pre-commit autoupdate [#289](https://github.com/jupyterlab/jupyterlab_server/pull/289) ([@pre-commit-ci](https://github.com/pre-commit-ci))
4440

4541
### Documentation improvements
4642

@@ -58,15 +54,15 @@ github_url: "https://github.com/jupyterlab/jupyterlab_server/blob/master/CHANGEL
5854

5955
### Maintenance and upkeep improvements
6056

61-
- [pre-commit.ci] pre-commit autoupdate [#287](https://github.com/jupyterlab/jupyterlab_server/pull/287) ([@pre-commit-ci](https://github.com/pre-commit-ci))
62-
- [pre-commit.ci] pre-commit autoupdate [#286](https://github.com/jupyterlab/jupyterlab_server/pull/286) ([@pre-commit-ci](https://github.com/pre-commit-ci))
57+
- \[pre-commit.ci\] pre-commit autoupdate [#287](https://github.com/jupyterlab/jupyterlab_server/pull/287) ([@pre-commit-ci](https://github.com/pre-commit-ci))
58+
- \[pre-commit.ci\] pre-commit autoupdate [#286](https://github.com/jupyterlab/jupyterlab_server/pull/286) ([@pre-commit-ci](https://github.com/pre-commit-ci))
6359
- Suppress tornado 6.2 beta warnings [#285](https://github.com/jupyterlab/jupyterlab_server/pull/285) ([@blink1073](https://github.com/blink1073))
64-
- [pre-commit.ci] pre-commit autoupdate [#284](https://github.com/jupyterlab/jupyterlab_server/pull/284) ([@pre-commit-ci](https://github.com/pre-commit-ci))
65-
- [pre-commit.ci] pre-commit autoupdate [#283](https://github.com/jupyterlab/jupyterlab_server/pull/283) ([@pre-commit-ci](https://github.com/pre-commit-ci))
60+
- \[pre-commit.ci\] pre-commit autoupdate [#284](https://github.com/jupyterlab/jupyterlab_server/pull/284) ([@pre-commit-ci](https://github.com/pre-commit-ci))
61+
- \[pre-commit.ci\] pre-commit autoupdate [#283](https://github.com/jupyterlab/jupyterlab_server/pull/283) ([@pre-commit-ci](https://github.com/pre-commit-ci))
6662
- Add compat for openapi-core 0.15 [#281](https://github.com/jupyterlab/jupyterlab_server/pull/281) ([@blink1073](https://github.com/blink1073))
67-
- [pre-commit.ci] pre-commit autoupdate [#280](https://github.com/jupyterlab/jupyterlab_server/pull/280) ([@pre-commit-ci](https://github.com/pre-commit-ci))
68-
- [pre-commit.ci] pre-commit autoupdate [#279](https://github.com/jupyterlab/jupyterlab_server/pull/279) ([@pre-commit-ci](https://github.com/pre-commit-ci))
69-
- [pre-commit.ci] pre-commit autoupdate [#277](https://github.com/jupyterlab/jupyterlab_server/pull/277) ([@pre-commit-ci](https://github.com/pre-commit-ci))
63+
- \[pre-commit.ci\] pre-commit autoupdate [#280](https://github.com/jupyterlab/jupyterlab_server/pull/280) ([@pre-commit-ci](https://github.com/pre-commit-ci))
64+
- \[pre-commit.ci\] pre-commit autoupdate [#279](https://github.com/jupyterlab/jupyterlab_server/pull/279) ([@pre-commit-ci](https://github.com/pre-commit-ci))
65+
- \[pre-commit.ci\] pre-commit autoupdate [#277](https://github.com/jupyterlab/jupyterlab_server/pull/277) ([@pre-commit-ci](https://github.com/pre-commit-ci))
7066

7167
### Contributors to this release
7268

@@ -84,9 +80,9 @@ github_url: "https://github.com/jupyterlab/jupyterlab_server/blob/master/CHANGEL
8480

8581
### Maintenance and upkeep improvements
8682

87-
- [pre-commit.ci] pre-commit autoupdate [#275](https://github.com/jupyterlab/jupyterlab_server/pull/275) ([@pre-commit-ci](https://github.com/pre-commit-ci))
83+
- \[pre-commit.ci\] pre-commit autoupdate [#275](https://github.com/jupyterlab/jupyterlab_server/pull/275) ([@pre-commit-ci](https://github.com/pre-commit-ci))
8884
- Switch to hatch backend [#274](https://github.com/jupyterlab/jupyterlab_server/pull/274) ([@blink1073](https://github.com/blink1073))
89-
- [pre-commit.ci] pre-commit autoupdate [#272](https://github.com/jupyterlab/jupyterlab_server/pull/272) ([@pre-commit-ci](https://github.com/pre-commit-ci))
85+
- \[pre-commit.ci\] pre-commit autoupdate [#272](https://github.com/jupyterlab/jupyterlab_server/pull/272) ([@pre-commit-ci](https://github.com/pre-commit-ci))
9086
- Switch to flit build backend [#271](https://github.com/jupyterlab/jupyterlab_server/pull/271) ([@blink1073](https://github.com/blink1073))
9187
- Allow bot PRs to be automatically labeled [#270](https://github.com/jupyterlab/jupyterlab_server/pull/270) ([@blink1073](https://github.com/blink1073))
9288

@@ -106,11 +102,11 @@ github_url: "https://github.com/jupyterlab/jupyterlab_server/blob/master/CHANGEL
106102

107103
### Maintenance and upkeep improvements
108104

109-
- [pre-commit.ci] pre-commit autoupdate [#266](https://github.com/jupyterlab/jupyterlab_server/pull/266) ([@pre-commit-ci](https://github.com/pre-commit-ci))
110-
- [pre-commit.ci] pre-commit autoupdate [#265](https://github.com/jupyterlab/jupyterlab_server/pull/265) ([@pre-commit-ci](https://github.com/pre-commit-ci))
105+
- \[pre-commit.ci\] pre-commit autoupdate [#266](https://github.com/jupyterlab/jupyterlab_server/pull/266) ([@pre-commit-ci](https://github.com/pre-commit-ci))
106+
- \[pre-commit.ci\] pre-commit autoupdate [#265](https://github.com/jupyterlab/jupyterlab_server/pull/265) ([@pre-commit-ci](https://github.com/pre-commit-ci))
111107
- Switch to importlib.metadata to list entry points [#264](https://github.com/jupyterlab/jupyterlab_server/pull/264) ([@fcollonval](https://github.com/fcollonval))
112108
- Make some pre-commit hooks manual [#263](https://github.com/jupyterlab/jupyterlab_server/pull/263) ([@blink1073](https://github.com/blink1073))
113-
- [pre-commit.ci] pre-commit autoupdate [#262](https://github.com/jupyterlab/jupyterlab_server/pull/262) ([@pre-commit-ci](https://github.com/pre-commit-ci))
109+
- \[pre-commit.ci\] pre-commit autoupdate [#262](https://github.com/jupyterlab/jupyterlab_server/pull/262) ([@pre-commit-ci](https://github.com/pre-commit-ci))
114110
- Add flake8 and handle warnings in tests [#259](https://github.com/jupyterlab/jupyterlab_server/pull/259) ([@blink1073](https://github.com/blink1073))
115111
- Add git-blame-ignore-revs [#258](https://github.com/jupyterlab/jupyterlab_server/pull/258) ([@blink1073](https://github.com/blink1073))
116112
- Apply Autoformats [#257](https://github.com/jupyterlab/jupyterlab_server/pull/257) ([@blink1073](https://github.com/blink1073))

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ classifiers = [
2424
requires-python = ">=3.7"
2525
dependencies = [
2626
"babel",
27-
"importlib_metadata>=3.6;python_version<\"3.10\"",
27+
"importlib_metadata>=4.8.3;python_version<\"3.10\"",
2828
"jinja2>=3.0.3",
2929
"json5",
3030
"jsonschema>=3.0.1",
@@ -60,7 +60,7 @@ test = [
6060
# openapi_core 0.15.0 alpha is not working
6161
"openapi_core~=0.14.2",
6262
"openapi-spec-validator<0.5",
63-
"pytest>=5.3.2",
63+
"pytest>=7.0",
6464
"pytest-console-scripts",
6565
"pytest-cov",
6666
"ruamel.yaml",

0 commit comments

Comments
 (0)