Merge pull request #1060 from martinRenou/remove_traitlets4_tests

Remove traitlets 4 test, add missing traitlets dependency and drop Python 3.6 support

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
 
     - name: Create the conda environment
       shell: bash -l {0}
-      run: mamba install -q python=${{ matrix.python_version }} pip jupyterlab_pygments==0.1.0 pytest-cov nodejs yarn flake8 ipywidgets matplotlib xeus-cling openssl=1.1.1l
+      run: mamba install -q python=${{ matrix.python_version }} pip jupyterlab_pygments==0.1.0 pytest-cov nodejs yarn flake8 ipywidgets matplotlib xeus-cling openssl=1.1.1l "traitlets>=5.0.3,<6"
 
     - name: Install dependencies
       shell: bash -l {0}
@@ -43,17 +43,9 @@ jobs:
         (cd tests/test_template; pip install .)
         (cd tests/skip_template; pip install .)
 
-    - name: Run tests (with traitlets 5)
+    - name: Run tests
       shell: bash -l {0}
       run: |
-        pip install "traitlets>=5.0.3,<6"
-        VOILA_TEST_XEUS_CLING=1 py.test tests/ --async-test-timeout=240
-
-    - name: Run tests (with traitlets 4)
-      shell: bash -l {0}
-      run: |
-        pip install "traitlets>=4,<5"
-        pip install ipykernel==5.5.5
         VOILA_TEST_XEUS_CLING=1 py.test tests/ --async-test-timeout=240
         voila --help  # Making sure we can run `voila --help`
         # tests if voila sends a 'heartbeat' to avoid proxies from closing an apparently stale connection
@@ -83,11 +75,11 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-          
+
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
-      
+
       - name: Install dependencies
         run: |
           python -m pip install jupyterlab_pygments==0.1.0 pytest-cov flake8 ipywidgets matplotlib traitlets

setup.cfg

@@ -16,10 +16,10 @@ classifiers =
     License :: OSI Approved :: BSD License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Framework :: Jupyter
     Framework :: Jupyter :: JupyterLab
     Framework :: Jupyter :: JupyterLab :: 3
@@ -30,13 +30,14 @@ classifiers =
 zip_safe = False
 include_package_data = True
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
     jupyter_server>=0.3.0,<2.0.0
     jupyter_client>=6.1.3,<8
     nbclient>=0.4.0,<0.6
     nbconvert>=6.0.0,<7
     websockets>=9.0
+    traitlets>=5.0.3,<6
 
 [options.extras_require]
 dev =