From 0813fdadfbb2b44c9362d1a4f894130fac5f6cc8 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Thu, 12 Sep 2024 12:27:16 +0200 Subject: [PATCH 1/2] Require JupyterHub>=2.3.1 and Python 3.8 --- CONTRIBUTING.md | 2 -- ldapauthenticator/__init__.py | 2 +- pyproject.toml | 4 ++-- setup.py | 6 +++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56c2127..676ce8c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,8 +9,6 @@ This guide was adapted from the [contributing guide in the main `jupyterhub` rep ## Setting up a development environment -JupyterHub requires Python >= 3.7. - As a Python project, a development install of JupyterHub follows standard practices for installation and testing. Note: if you have Docker installed locally, you can run all of the subsequent commands inside of a container after you run the following initial commands: diff --git a/ldapauthenticator/__init__.py b/ldapauthenticator/__init__.py index 99008a7..cf2752e 100644 --- a/ldapauthenticator/__init__.py +++ b/ldapauthenticator/__init__.py @@ -3,4 +3,4 @@ # __version__ should be updated using tbump, based on configuration in # pyproject.toml, according to instructions in RELEASE.md. # -__version__ = "1.3.3.dev" +__version__ = "2.0.0.dev" diff --git a/pyproject.toml b/pyproject.toml index 1d9e06f..cdb744a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,11 +25,11 @@ profile = "black" # target-version should be all supported versions, see # https://github.com/psf/black/issues/751#issuecomment-473066811 target_version = [ - "py37", "py38", "py39", "py310", "py311", + "py312", ] @@ -67,7 +67,7 @@ omit = [ github_url = "https://github.com/jupyterhub/systemdspawner" [tool.tbump.version] -current = "1.3.3.dev" +current = "2.0.0.dev" regex = ''' (?P\d+) \. diff --git a/setup.py b/setup.py index 8b9d12f..82c8a02 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="jupyterhub-ldapauthenticator", - version="1.3.3.dev", + version="2.0.0.dev", description="LDAP Authenticator for JupyterHub", long_description=open("README.md").read(), long_description_content_type="text/markdown", @@ -11,9 +11,9 @@ author_email="yuvipanda@riseup.net", license="3 Clause BSD", packages=["ldapauthenticator"], - python_requires=">=3.7", + python_requires=">=3.8", install_requires=[ - "jupyterhub", + "jupyterhub>=2.3.1", "ldap3", "tornado", "traitlets", From 3aee6728306aa08166967d3ebea6f6c90c44c2a4 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Thu, 12 Sep 2024 21:53:46 +0200 Subject: [PATCH 2/2] Require JupyterHub>=4.1.6 and Python 3.9 --- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 12 ++++-------- .pre-commit-config.yaml | 2 +- pyproject.toml | 1 - setup.py | 4 ++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 69fb732..5edccfd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,7 +23,7 @@ on: jobs: build-release: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1d4b790..5ffd468 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,23 +25,19 @@ env: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest timeout-minutes: 10 strategy: fail-fast: false matrix: include: - - python-version: "3.8" - pip-install-spec: "jupyterhub==2.3.1 sqlalchemy==1.*" - python-version: "3.9" - pip-install-spec: "jupyterhub==3.*" - - python-version: "3.10" pip-install-spec: "jupyterhub==4.*" - - python-version: "3.11" - pip-install-spec: "jupyterhub==5.*" - python-version: "3.12" - pip-install-spec: "jupyterhub" + pip-install-spec: "jupyterhub==5.*" + - python-version: "3.x" + pip-install-spec: "--pre jupyterhub" steps: - uses: actions/checkout@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e8d0cfe..06a7a76 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: hooks: - id: pyupgrade args: - - --py38-plus + - --py39-plus # Autoformat: Python code - repo: https://github.com/PyCQA/autoflake diff --git a/pyproject.toml b/pyproject.toml index cdb744a..a8605bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,6 @@ profile = "black" # target-version should be all supported versions, see # https://github.com/psf/black/issues/751#issuecomment-473066811 target_version = [ - "py38", "py39", "py310", "py311", diff --git a/setup.py b/setup.py index 82c8a02..f4d899a 100644 --- a/setup.py +++ b/setup.py @@ -11,9 +11,9 @@ author_email="yuvipanda@riseup.net", license="3 Clause BSD", packages=["ldapauthenticator"], - python_requires=">=3.8", + python_requires=">=3.9", install_requires=[ - "jupyterhub>=2.3.1", + "jupyterhub>=4.1.6", "ldap3", "tornado", "traitlets",