Skip to content

Commit

Permalink
Merge pull request #1 from jupyterhub/main
Browse files Browse the repository at this point in the history
bringing v4 back to my fork
  • Loading branch information
jannefleischer authored Feb 13, 2024
2 parents e2b8073 + 2e89ca0 commit a2561b2
Show file tree
Hide file tree
Showing 14 changed files with 272 additions and 144 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
id-token: write

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:
test-variation: podman

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "18"

Expand Down Expand Up @@ -127,4 +127,4 @@ jobs:
pytest tests/test_dockerspawner.py --cov=dockerspawner
# GitHub action reference: https://github.com/codecov/codecov-action
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
repos:
# Autoformat: Python code, syntax patterns are modernized
- repo: https://github.com/asottile/pyupgrade
rev: v3.4.0
rev: v3.15.0
hooks:
- id: pyupgrade
args:
- --py38-plus

# Autoformat: Python code
- repo: https://github.com/PyCQA/autoflake
rev: v2.1.1
rev: v2.2.1
hooks:
- id: autoflake
# args ref: https://github.com/PyCQA/autoflake#advanced-usage
Expand All @@ -32,7 +32,7 @@ repos:

# Autoformat: Python
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.10.1
hooks:
- id: black

Expand All @@ -44,19 +44,19 @@ repos:

# Autoformat: markdown, yaml
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.9-for-vscode
rev: v3.0.3
hooks:
- id: prettier

# Lint: Python code
- repo: https://github.com/PyCQA/flake8
rev: "6.0.0"
rev: "6.1.0"
hooks:
- id: flake8

# Misc autoformatting and linting
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: end-of-file-fixer
- id: requirements-txt-fixer
Expand Down
3 changes: 2 additions & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
netifaces
notebook<7
pytest>=3.6
pytest-asyncio
# FIXME: unpin pytest-asyncio
pytest-asyncio>=0.17,<0.23
pytest-cov
2 changes: 1 addition & 1 deletion dockerspawner/_version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# __version__ should be updated using tbump, based on configuration in
# pyproject.toml, according to instructions in RELEASE.md.
#
__version__ = "12.2.0.dev"
__version__ = "13.1.0.dev"

# version_info looks like (1, 2, 3, "dev") if __version__ is 1.2.3.dev
version_info = tuple(int(p) if p.isdigit() else p for p in __version__.split("."))
Loading

0 comments on commit a2561b2

Please sign in to comment.