Skip to content

Commit eb3e8fa

Browse files
committed
Drop tox
1 parent 1802c43 commit eb3e8fa

File tree

7 files changed

+25
-80
lines changed

7 files changed

+25
-80
lines changed

.github/workflows/main.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
python-version: 3.8
2020
- uses: pre-commit/[email protected]
2121

22-
build-n-test-n-coverage:
22+
build:
2323
name: Build, test and code coverage
2424
runs-on: ${{ matrix.os }}
2525
strategy:
@@ -39,17 +39,24 @@ jobs:
3939
steps:
4040
- name: Checkout
4141
uses: actions/checkout@v2
42+
4243
- name: Set up Python ${{ matrix.python-version }}
4344
uses: actions/setup-python@v2
4445
with:
4546
python-version: ${{ matrix.python-version }}
47+
4648
- name: Install dependencies
4749
run: |
48-
python -m pip install --upgrade pip
49-
pip install -e .[test]
50-
pip install tox coverage tox-gh-actions
50+
pip install .[test]
51+
pip install coverage
52+
53+
- name: Type check
54+
run: mypy nbclient
55+
5156
- name: Run the tests
52-
run: tox
57+
run: |
58+
pytest -vv --maxfail=2 --cov=nbclient --cov-report=xml -W always
59+
5360
- name: Upload coverage to Codecov
5461
uses: codecov/codecov-action@v2
5562
with:
@@ -58,3 +65,8 @@ jobs:
5865
env_vars: OS,PYTHON
5966
name: codecov-umbrella
6067
fail_ci_if_error: false
68+
69+
- name: Build documentation
70+
run: |
71+
pip install .[sphinx]
72+
sphinx-build docs docs_build --color -W -bhtml

nbclient/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from textwrap import dedent
55

66
import nbformat
7-
from jupyter_core.application import JupyterApp
7+
from jupyter_core.application import JupyterApp # type: ignore
88
from traitlets import Bool, Integer, List, Unicode, default
99
from traitlets.config import catch_config_error
1010

nbclient/tests/test_client.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
import nbformat
1515
import pytest
16-
import xmltodict
16+
import xmltodict # type: ignore
1717
from ipython_genutils.py3compat import string_types
1818
from jupyter_client import KernelManager
1919
from jupyter_client.kernelspec import KernelSpecManager
20-
from nbconvert.filters import strip_ansi
20+
from nbconvert.filters import strip_ansi # type: ignore
2121
from nbformat import NotebookNode
22-
from testpath import modified_env
22+
from testpath import modified_env # type: ignore
2323
from traitlets import TraitError
2424

2525
from .. import NotebookClient, execute

nbclient/util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def check_patch_tornado() -> None:
3232
import tornado.concurrent # type: ignore
3333

3434
if asyncio.Future not in tornado.concurrent.FUTURES:
35-
tornado.concurrent.FUTURES = tornado.concurrent.FUTURES + (
35+
tornado.concurrent.FUTURES = tornado.concurrent.FUTURES + ( # type: ignore
3636
asyncio.Future,
37-
) # type: ignore
37+
)
3838

3939

4040
def just_run(coro: Awaitable) -> Any:

requirements-dev.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
codecov
2-
coverage
31
ipython
42
ipykernel
53
ipywidgets
@@ -8,9 +6,8 @@ pytest-cov>=2.6.1
86
check-manifest
97
flake8
108
mypy
11-
tox
129
xmltodict
13-
black; python_version >= '3.6'
10+
black
1411
pip>=18.1
1512
wheel>=0.31.0
1613
setuptools>=38.6.0

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
name = 'nbclient'
1212

1313
local_path = os.path.dirname(__file__)
14-
# Fix for tox which manipulates execution pathing
15-
if not local_path:
16-
local_path = '.'
1714
here = os.path.abspath(local_path)
1815

1916

@@ -31,7 +28,7 @@ def read_reqs(fname):
3128
requirements = read(os.path.join(os.path.dirname(__file__), "requirements.txt"))
3229
dev_reqs = read_reqs(os.path.join(os.path.dirname(__file__), 'requirements-dev.txt'))
3330
doc_reqs = read_reqs(os.path.join(os.path.dirname(__file__), 'docs/requirements-doc.txt'))
34-
extras_require = {"test": dev_reqs, "dev": dev_reqs, "sphinx": doc_reqs}
31+
extras_require = {"test": dev_reqs, "sphinx": doc_reqs}
3532

3633
setup(
3734
name=name,

tox.ini

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

0 commit comments

Comments
 (0)