From 48fb973071203e8fc4ef8b41c0c2cfc0bc6d4ed3 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 19 Dec 2022 07:37:55 -0600 Subject: [PATCH] CI Cleanup (#6667) * ci cleanup * lint * run ui tests on ubuntu 20.04 --- .github/workflows/build.yml | 2 ++ .github/workflows/ui-tests.yml | 2 +- .pre-commit-config.yaml | 2 +- pyproject.toml | 21 ++++++++++----------- ui-tests/test/jupyter_server_config.py | 12 ++++++------ 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efd62c8e1a..07c1b3a538 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,8 @@ on: push: branches: ['main'] pull_request: + schedule: + - cron: "0 0 * * *" permissions: contents: diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index a7d6ee5216..de2abfe673 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -23,7 +23,7 @@ jobs: ui-tests: needs: [build] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 timeout-minutes: 20 strategy: fail-fast: false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d66670ec0c..8bf411439f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: black - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.165 + rev: v0.0.185 hooks: - id: ruff args: ["--fix"] diff --git a/pyproject.toml b/pyproject.toml index 9deaa94225..4223c5bf80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,14 +74,6 @@ dev = [ "pre-commit", "hatch" ] -lint = [ - "black[jupyter]>=22.6.0", - "mdformat>0.7", - "mdformat-gfm>=0.3.5", - "ruff>=0.0.156" -] -typing = ["mypy>=0.990"] - [tool.hatch.version] path = "notebook/_version.py" @@ -139,15 +131,22 @@ test = "python -m pytest -vv --cov notebook --cov-branch --cov-report term-missi nowarn = "test -W default {args}" [tool.hatch.envs.typing] -features = ["typing", "test"] +features = ["test"] +dependencies = ["mypy>=0.990"] [tool.hatch.envs.typing.scripts] test = "mypy --install-types --non-interactive {args:notebook tests}" [tool.hatch.envs.lint] -features = ["lint"] +dependencies = [ + "black[jupyter]>=22.6.0", + "mdformat>0.7", + "mdformat-gfm>=0.3.5", + "ruff>=0.0.156" +] +detached = true [tool.hatch.envs.lint.scripts] style = [ - "ruff {args:notebook}", + "ruff {args:notebook tests ui-tests}", "black --check --diff {args:.}", "mdformat --check {args:CHANGELOG.md}" ] diff --git a/ui-tests/test/jupyter_server_config.py b/ui-tests/test/jupyter_server_config.py index 085a0957cc..808c66110d 100644 --- a/ui-tests/test/jupyter_server_config.py +++ b/ui-tests/test/jupyter_server_config.py @@ -2,13 +2,13 @@ from typing import Any c: Any -c.ServerApp.port = 8888 -c.ServerApp.port_retries = 0 -c.ServerApp.open_browser = False +c.ServerApp.port = 8888 # noqa +c.ServerApp.port_retries = 0 # noqa +c.ServerApp.open_browser = False # noqa -c.ServerApp.root_dir = mkdtemp(prefix="galata-test-") +c.ServerApp.root_dir = mkdtemp(prefix="galata-test-") # noqa c.ServerApp.token = "" # noqa c.ServerApp.password = "" # noqa -c.ServerApp.disable_check_xsrf = True +c.ServerApp.disable_check_xsrf = True # noqa -c.JupyterNotebookApp.expose_app_in_browser = True +c.JupyterNotebookApp.expose_app_in_browser = True # noqa