Simplify binder build & fix CI (#160)

* Simplify binder build

* Update postBuild

* Add `jupyter-server` explicitly

* Correct package name

* Add missing requests

* Skip pip check

* Fix develop mode

* More fix

* Skip broken nbclassic

* Back to Python 3.7 for non unix tests

Author: fcollonval

.github/workflows/build.yml

@@ -38,25 +38,23 @@ jobs:
           use-only-tar-bz2: true
       - name: Install dependencies
         run: |
-          conda activate test_gator
+          conda info
           conda install -n test_gator --file requirements_dev.txt
           python setup.py develop --skip-npm
-          # Check pip dependencies
-          python -m pip check
+          # Check pip dependencies - broken for Python 3.7
+          # python -m pip check
         shell: bash -l {0}
       - name: Test the server extension
-        run: |
-          conda activate test_gator
-          python -m pytest -ra mamba_gator
+        run: python -m pytest -ra mamba_gator
         shell: bash -l {0}
 
   test-backend-mamba:
     name: Test server with Mamba Python ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # Skip 3.7 as it is used for integration tests
-        python-version: ["3.8", "3.9"]
+        # Skip 3.9 as it is used for integration tests
+        python-version: ["3.7", "3.8"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -83,22 +81,21 @@ jobs:
           use-only-tar-bz2: true
       - name: Install dependencies
         run: |
-          conda activate test_gator
+          conda info
           mamba install -n test_gator --file requirements_dev.txt
           python setup.py develop --skip-npm
-          # Check pip dependencies
-          python -m pip check
+          # Check pip dependencies - broken for Python 3.7
+          # python -m pip check
         shell: bash -l {0}
       - name: Test the server extension
-        run: |
-          conda activate test_gator
-          python -m pytest -ra mamba_gator
+        run: python -m pytest -ra mamba_gator
         shell: bash -l {0}
 
   test-all-os:
     name: Test Conda Python 3.7 on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     continue-on-error: true
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -151,9 +148,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          conda activate test_gator
+          conda info
           conda install -n test_gator --file requirements_dev.txt
-          conda install -n test_gator jupyterlab=3
+          conda install -n test_gator jupyterlab=3 "nbclassic!=0.3.3"
           yarn install
           python -m pip install -e .
         shell: bash -l {0}
@@ -162,7 +159,6 @@ jobs:
         env:
           OS_RUNNER: ${{ matrix.os }}
         run: |
-          conda activate test_gator
           python -m pytest mamba_gator
           yarn run test
 
@@ -172,7 +168,7 @@ jobs:
         shell: bash -l {0}
 
   test-integration:
-    name: All tests on Ubuntu Mamba Python 3.7
+    name: All tests on Ubuntu Mamba Python 3.9
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -184,10 +180,10 @@ jobs:
           CACHE_NUMBER: 0
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-mamba-3.7-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements_dev.txt') }}
+          key: ${{ runner.os }}-mamba-3.9-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements_dev.txt') }}
           restore-keys: |
-            ${{ runner.os }}-mamba-3.7-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements_dev.txt') }}
-            ${{ runner.os }}-mamba-3.7
+            ${{ runner.os }}-mamba-3.9-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements_dev.txt') }}
+            ${{ runner.os }}-mamba-3.9
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -206,22 +202,22 @@ jobs:
             ${{ runner.os }}-yarn-${{ env.CACHE_NUMBER }}
             ${{ runner.os }}-yarn-
 
-      - name: Setup Python 3.7
+      - name: Setup Python 3.9
         uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: test_gator
           auto-update-conda: true
           channels: conda-forge
           mamba-version: "*"
-          python-version: "3.7"
+          python-version: "3.9"
           show-channel-urls: true
           use-only-tar-bz2: true
 
       - name: Install dependencies
         run: |
-          conda activate test_gator
+          conda info
           mamba install -n test_gator --file requirements_dev.txt
-          mamba install -n test_gator coveralls jupyterlab=3
+          mamba install -n test_gator coveralls jupyterlab=3 "nbclassic!=0.3.3"
           yarn install
           python -m pip install -e .
           # Check pip dependencies
@@ -230,7 +226,6 @@ jobs:
 
       - name: Test the extension
         run: |
-          conda activate test_gator
           # Run linter
           flake8 setup.py mamba_gator
           yarn run eslint:check

binder/postBuild

@@ -7,9 +7,6 @@ yarn run build
 python -m pip install .
 python -m pip install jupyterlab-tour
 
-jupyter labextension install @jupyterlab/server-proxy --no-build
-jupyter lab build --minimize=False
-
 # Import the workspace into JupyterLab
 jupyter lab workspaces import binder/workspace.json
 

mamba_gator/tests/test_api.py

@@ -59,7 +59,7 @@ def mk_env(self, name=None, packages=None, remove_if_exists=True):
 
         return self.conda_api.post(
             ["environments"],
-            body={"name": new_name, "packages": packages or ["python"]},
+            body={"name": new_name, "packages": packages or ["python!=3.10.0"]},
         )
 
     def rm_env(self, name):
@@ -541,7 +541,7 @@ def test_get_has_update(self):
         self.wait_for_task(
             self.conda_api.post,
             ["environments"],
-            body={"name": n, "packages": ["python"]},
+            body={"name": n, "packages": ["python!=3.10.0"]},
         )
 
         r = self.wait_for_task(
@@ -556,7 +556,7 @@ def test_get_has_update(self):
         self.wait_for_task(
             self.conda_api.post,
             ["environments"],
-            body={"name": n, "packages": ["python", "alabaster=0.7.11"]},
+            body={"name": n, "packages": ["python!=3.10.0", "alabaster=0.7.11"]},
         )
 
         r = self.wait_for_task(
@@ -583,15 +583,15 @@ def test_env_export(self):
 
     def test_env_export_history(self):
         n = generate_name()
-        self.wait_for_task(self.mk_env, n)
+        self.wait_for_task(self.mk_env, n, packages=["python=3.9"])
         r = self.conda_api.get(
             ["environments", n], params={"download": 1, "history": 1}
         )
         self.assertEqual(r.status_code, 200)
 
         content = " ".join(r.text.splitlines())
         self.assertRegex(
-            content, r"^name:\s" + n + r"\s+channels:(\s+- conda-forge)?\s+- defaults\s+dependencies:\s+- python\s+prefix:"
+            content, r"^name:\s" + n + r"\s+channels:(\s+- conda-forge)?\s+- defaults\s+dependencies:\s+- python=3\.9\s+prefix:"
         )
 
     def test_env_export_not_supporting_history(self):

requirements_dev.txt

@@ -4,7 +4,9 @@ nb_conda_kernels >=2.2.0
 packaging
 jupyter_client
 jupyter-packaging >=0.7.9,<0.8.0
+jupyter_server
 jupyterlab_server
+requests
 tornado
 traitlets
 coverage