Skip to content

Commit

Permalink
Merge pull request #245 from consideRatio/pr/req-jh2py38
Browse files Browse the repository at this point in the history
Require jupyterhub 4.1.6+ and Python 3.9+
  • Loading branch information
minrk authored Sep 13, 2024
2 parents 8a7d867 + 3aee672 commit f621dee
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:

jobs:
build-release:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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:
- --py38-plus
- --py39-plus

# Autoformat: Python code
- repo: https://github.com/PyCQA/autoflake
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ldapauthenticator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ 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",
]


Expand Down Expand Up @@ -67,7 +66,7 @@ omit = [
github_url = "https://github.com/jupyterhub/systemdspawner"

[tool.tbump.version]
current = "1.3.3.dev"
current = "2.0.0.dev"
regex = '''
(?P<major>\d+)
\.
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -11,9 +11,9 @@
author_email="[email protected]",
license="3 Clause BSD",
packages=["ldapauthenticator"],
python_requires=">=3.7",
python_requires=">=3.9",
install_requires=[
"jupyterhub",
"jupyterhub>=4.1.6",
"ldap3",
"tornado",
"traitlets",
Expand Down

0 comments on commit f621dee

Please sign in to comment.