Merge branch 'master' into quince

overhangio · Dec 11, 2023 · fb85393 · fb85393
2 parents 6aea052 + 6e7e06f
commit fb85393
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,6 +17,6 @@ jobs:
         run: python -m pip install --upgrade pip setuptools
       - name: Install dependencies
         run: |
-          pip install 'tutor[dev]>=16.0.0,<17.0.0'
+          pip install .[dev]
       - name: Test lint, types, and format
         run: make test
diff --git a/setup.py b/setup.py
@@ -42,6 +42,7 @@ def load_about():
     include_package_data=True,
     python_requires=">=3.8",
     install_requires=["tutor>=17.0.0,<18.0.0"],
+    extras_require={"dev": ["tutor[dev]>=16.0.0,<17.0.0"]},
     entry_points={"tutor.plugin.v1": ["cairn = tutorcairn.plugin"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",

diff --git a/tutorcairn/templates/cairn/build/cairn-superset/Dockerfile b/tutorcairn/templates/cairn/build/cairn-superset/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update \
     && apt-get install -y \
         pkg-config
 
-RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/root/.cache/pip,sharing=shared {% endif %}pip install \
+RUN --mount=type=cache,target=/root/.cache/pip,sharing=shared pip install \
     clickhouse-driver==0.2.6 \
     mysqlclient==2.2.0 \
     clickhouse-connect==0.6.20 \