From 7c7d4005352b60625d37bb7f9d528c369ebe3a57 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sat, 19 Nov 2022 15:37:31 -0600 Subject: [PATCH] fixes --- .github/workflows/build.yml | 5 ++++- pyproject.toml | 1 + tests/conftest.py | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe919a7f8..621279064 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,6 +63,9 @@ jobs: steps: - uses: actions/checkout@v3 - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + - run: | + # pandoc is not up to date in the ubuntu repos, so we install directly + wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb && sudo dpkg -i pandoc-2.14.2-1-amd64.deb - run: hatch run docs:build test_minimum_versions: @@ -73,7 +76,7 @@ jobs: - uses: actions/checkout@v3 - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 with: - python_version: "3.8" + python_version: "3.7" - uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1 with: only_create_file: 1 diff --git a/pyproject.toml b/pyproject.toml index 1bebf8ef2..34ed313fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ classifiers = [ ] dependencies = [ "jupyter_server>=1.16.0,<2", + "importlib-resources>=1.4;python_version<\"3.9\"", "jupyterlab>=4.0.0a30,<5", "jupyterlab_server>=2.13,<3", "notebook_shim>=0.1,<0.2", diff --git a/tests/conftest.py b/tests/conftest.py index edbdee980..5ade89da1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,7 +4,11 @@ import os import os.path as osp import pathlib import shutil -from importlib.resources import files + +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files import pytest