Skip to content

Commit

Permalink
Merge pull request #274 from consideRatio/pr/require-jh4
Browse files Browse the repository at this point in the history
Require jupyterhub 4.1.6+ and Python 3.9+
  • Loading branch information
consideRatio authored Sep 12, 2024
2 parents 0322ec8 + b4fb9b1 commit c003e37
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:

jobs:
build-release:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
permissions:
# id-token=write is required for pypa/gh-action-pypi-publish, and the PyPI
# project needs to be configured to trust this workflow.
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: install build package
run: |
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,16 @@ on:

jobs:
pytest:
# FIXME: ubuntu-20.04 comes with py36, but ubuntu-22.04 doesn't, so only
# bump this when we stop testing py36
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
include:
- python-version: "3.6"
pip-install-spec: "jupyterhub==1.3.* sqlalchemy==1.*"
- python-version: "3.7"
pip-install-spec: "jupyterhub==1.4.* sqlalchemy==1.*"
- python-version: "3.8"
pip-install-spec: "jupyterhub==1.* sqlalchemy==1.*"
- python-version: "3.9"
pip-install-spec: "jupyterhub==2.* sqlalchemy==1.*"
- python-version: "3.10"
pip-install-spec: "jupyterhub==3.*"
- python-version: "3.11"
pip-install-spec: "jupyterhub==4.*"
- python-version: "3.12"
pip-install-spec: "jupyterhub==5.*"
- python-version: "3.x"
pip-install-spec: "--pre jupyterhub"
accept-failure: true
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
hooks:
- id: pyupgrade
args:
- --py36-plus
- --py39-plus

# Autoformat: Python code
- repo: https://github.com/PyCQA/autoflake
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ remove-unused-variables = true
[tool.black]
skip-string-normalization = true
target_version = [
"py36",
"py37",
"py38",
"py39",
"py310",
"py311",
"py312",
]


Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
"native = nativeauthenticator:NativeAuthenticator",
],
},
python_requires=">=3.9",
install_requires=[
"jupyterhub>=1.3",
"jupyterhub>=4.1.6",
"bcrypt",
"onetimepass",
],
Expand Down

0 comments on commit c003e37

Please sign in to comment.