Skip to content

Commit

Permalink
Merge pull request #6600 from jtpio/python-311
Browse files Browse the repository at this point in the history
Bump to Python 3.11 on CI
  • Loading branch information
jtpio authored Nov 16, 2022
2 parents 003eb9c + 0ce4fe5 commit 58823f0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
with:
python_version: "3.10"
python_version: "3.11"

- name: Install the package
run: |
Expand Down Expand Up @@ -89,11 +89,11 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python: ['3.7', '3.10']
python: ['3.7', '3.11']
include:
- python: '3.7'
dist: 'notebook*.tar.gz'
- python: '3.10'
- python: '3.11'
dist: 'notebook*.whl'
- os: windows-latest
py_cmd: python
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks:
micromamba activate
EOT
source /workspace/bin/activate-env.sh
micromamba install -n base -y -c conda-forge python=3.10 nodejs=14 yarn
micromamba install -n base -y -c conda-forge python=3.11 nodejs=14 yarn
python -m pip install -e ".[dev,test]" && jlpm && jlpm run build && jlpm develop
gp sync-done setup
command: |
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ dependencies:
- matplotlib
- numpy
- nodejs
- python >=3.9,<3.10
- python >=3.10,<3.11
- xeus-python
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"jupyter_server>=1.16.0,<2",
Expand Down
6 changes: 3 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import os.path as osp
import shutil
from importlib.resources import path
from importlib.resources import files
from os.path import join as pjoin

import pytest
Expand Down Expand Up @@ -51,7 +51,7 @@ def _make_notebook_app(**kwargs):
)

# Copy the template files.
for html_path in glob.glob(f"{path('notebook', 'templates')}/*.html"):
for html_path in glob.glob(str(files("notebook.templates").joinpath("*.html"))):
shutil.copy(html_path, jp_template_dir)

# Create the index file.
Expand Down Expand Up @@ -88,7 +88,7 @@ def _make_notebook_app(**kwargs):
)

# Copy the schema files.
test_data = str(path("jupyterlab_server", "test_data"))
test_data = str(files("jupyterlab_server.test_data").joinpath(""))
src = pjoin(test_data, "schemas", "@jupyterlab")
dst = pjoin(str(schemas_dir), "@jupyterlab")
if os.path.exists(dst):
Expand Down

0 comments on commit 58823f0

Please sign in to comment.