Skip to content

Commit be994d2

Browse files
authored
Fix jupytext and lint CI failures (#1413)
1 parent 19498e8 commit be994d2

File tree

4 files changed

+37
-26
lines changed

4 files changed

+37
-26
lines changed

.github/workflows/downstream.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
123123
with:
124124
package_name: jupytext
125-
test_command: pip install pytest-jupyter[server] gitpython pre-commit && python -m ipykernel install --name jupytext-dev --user && pytest -vv -raXxs -W default --durations 10 --color=yes
125+
test_command: pip install pytest-jupyter[server] gitpython pre-commit && python -m ipykernel install --name jupytext-dev --user && pytest -vv -raXxs -W default --durations 10 --ignore=tests/functional/others --color=yes
126126

127127
downstream_check: # This job does nothing and is only used for the branch protection
128128
if: always()

.github/workflows/python-tests.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
wget https://github.com/jgm/pandoc/releases/download/3.1.2/pandoc-3.1.2-1-amd64.deb && sudo dpkg -i pandoc-3.1.2-1-amd64.deb
4444
- name: Run the tests on posix
4545
if: ${{ !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.os, 'windows') }}
46-
run: hatch run cov:test --cov-fail-under 75 || hatch run test:test --lf
46+
run: hatch run cov:test --cov-fail-under 75 || hatch -v run test:test --lf
4747
- name: Run the tests on pypy
4848
if: ${{ startsWith(matrix.python-version, 'pypy') }}
49-
run: hatch run test:nowarn || hatch run test:nowarn --lf
49+
run: hatch run test:nowarn || hatch -v run test:nowarn --lf
5050
- name: Run the tests on windows
5151
if: ${{ startsWith(matrix.os, 'windows') }}
52-
run: hatch run cov:nowarn -s || hatch run cov:nowarn --lf
52+
run: hatch run cov:nowarn -s || hatch -v run cov:nowarn --lf
5353
- uses: jupyterlab/maintainer-tools/.github/actions/upload-coverage@v1
5454

5555
test_docs:
@@ -64,14 +64,14 @@ jobs:
6464
sudo apt-get install enchant-2 # for spell checking
6565
- name: Build API docs
6666
run: |
67-
hatch run docs:api
67+
hatch -v run docs:api
6868
# If this fails run `hatch run docs:api` locally
6969
# and commit.
7070
git status --porcelain
7171
git status -s | grep "A" && exit 1
7272
git status -s | grep "M" && exit 1
7373
echo "API docs done"
74-
- run: hatch run docs:build
74+
- run: hatch -v run docs:build
7575

7676
test_lint:
7777
name: Test Lint
@@ -81,8 +81,8 @@ jobs:
8181
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
8282
- name: Run Linters
8383
run: |
84-
hatch run typing:test
85-
hatch run lint:build
84+
hatch -v run typing:test
85+
hatch -v run lint:build
8686
pipx run interrogate -v .
8787
pipx run doc8 --max-line-length=200 --ignore-path=docs/source/other/full-config.rst
8888
npm install -g eslint
@@ -114,7 +114,7 @@ jobs:
114114
dependency_type: minimum
115115
- name: Run the unit tests
116116
run: |
117-
hatch -vv run test:nowarn || hatch run test:nowarn --lf
117+
hatch -vv run test:nowarn || hatch -v run test:nowarn --lf
118118
119119
test_prereleases:
120120
name: Test Prereleases
@@ -127,7 +127,7 @@ jobs:
127127
dependency_type: pre
128128
- name: Run the tests
129129
run: |
130-
hatch run test:nowarn || hatch run test:nowarn --lf
130+
hatch run test:nowarn || hatch -v run test:nowarn --lf
131131
132132
make_sdist:
133133
name: Make SDist
@@ -148,7 +148,7 @@ jobs:
148148
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1
149149
with:
150150
package_spec: -vv .
151-
test_command: hatch run test:test || hatch run test:test --lf
151+
test_command: hatch run test:test || hatch -v run test:test --lf
152152

153153
check_release:
154154
runs-on: ubuntu-latest
@@ -185,7 +185,7 @@ jobs:
185185
- uses: actions/checkout@v4
186186
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
187187
- name: Run the tests
188-
run: hatch run cov:integration
188+
run: hatch -v run cov:integration
189189
- uses: jupyterlab/maintainer-tools/.github/actions/upload-coverage@v1
190190

191191
integration_check_pypy:
@@ -196,7 +196,7 @@ jobs:
196196
with:
197197
python_version: "pypy-3.8"
198198
- name: Run the tests
199-
run: hatch run test:nowarn --integration_tests=true
199+
run: hatch -v run test:nowarn --integration_tests=true
200200

201201
coverage:
202202
runs-on: ubuntu-latest

eslint.config.mjs

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
export default [
2+
{
3+
"languageOptions": {
4+
"parserOptions": {
5+
"ecmaVersion": 6,
6+
"sourceType": "module"
7+
}
8+
},
9+
"rules": {
10+
"semi": 1,
11+
"no-cond-assign": 2,
12+
"no-debugger": 2,
13+
"comma-dangle": 0,
14+
"no-unreachable": 2
15+
},
16+
"ignores": [
17+
"*.min.js",
18+
"*components*",
19+
"*node_modules*",
20+
"*built*",
21+
"*build*"
22+
]
23+
}
24+
];

package.json

-13
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@
1010
"bootstrap": "^3.4.0",
1111
"copyfiles": "^2.4.1"
1212
},
13-
"eslintConfig": {
14-
"parserOptions": {
15-
"ecmaVersion": 6,
16-
"sourceType": "module"
17-
},
18-
"rules": {
19-
"semi": 1,
20-
"no-cond-assign": 2,
21-
"no-debugger": 2,
22-
"comma-dangle": 0,
23-
"no-unreachable": 2
24-
}
25-
},
2613
"eslintIgnore": [
2714
"*.min.js",
2815
"*components*",

0 commit comments

Comments
 (0)