Update to Jupyterlab 3.0 (#818)

Co-authored-by: Frédéric Collonval <[email protected]>
Co-authored-by: Luciano Resende <[email protected]>

Author: 3 people

.eslintrc.js

@@ -13,11 +13,17 @@ module.exports = {
     },
     plugins: ['@typescript-eslint'],
     rules: {
-      '@typescript-eslint/camelcase': 'off',
       '@typescript-eslint/explicit-function-return-type': 'off',
-      '@typescript-eslint/interface-name-prefix': [
-        'error',
-        { prefixWithI: 'always' }
+      "@typescript-eslint/naming-convention": [
+        "error",
+        {
+          "selector": "interface",
+          "format": ["PascalCase"],
+          "custom": {
+            "regex": "^I[A-Z]",
+            "match": true
+          }
+        }
       ],
       '@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
       '@typescript-eslint/no-explicit-any': 'off',

.github/workflows/build.yml

@@ -1,8 +1,8 @@
-name: Test
+name: Build
 
 on:
   push:
-    branches: [master]
+    branches: master
   pull_request:
     branches: "*"
 
@@ -12,22 +12,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ["3.6", "3.7", "3.8", "3.9"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: "12.x"
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: 'x64'
+          architecture: "x64"
 
       - name: Get pip cache dir
         id: pip-cache
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
-      
+
       - name: pip cache
         uses: actions/cache@v2
         with:
@@ -56,39 +59,28 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install dependencies
-        run: |
-          pip install wheel
-          pip install --upgrade --upgrade-strategy=eager "jupyterlab~=2.0"
-
+        run: python -m pip install -U  jupyter_packaging~=0.7.9 jupyterlab~=3.0 pip wheel
       - name: Test the extension
         run: |
-          # Build the sdist (identical to what will be uploaded to eg pypi on release)
-          python setup.py sdist
-          # Linter checks
-          jlpm run eslint-check
-        
-          # Install the extension from the sdist ensuring the cache is unused
-          pip install jupyterlab_git[test] --pre --no-index --find-links=dist --no-deps --no-cache-dir -v
-          # Install the extension dependencies based on the current setup.py
-          pip install jupyterlab_git[test]
+          jlpm
+          jlpm run eslint:check
+          python -m pip install -e .[dev]
 
           # Python formatting checks
           black . --check
-        
+
           # Run the Python tests
           pytest jupyterlab_git -r ap
           # Run the TS/JS tests
           jlpm run test
-        
-          # Log the current state of jupyterlab's extensions
-          jupyter labextension list
-          # Rebuild jupyterlab to include our extension
-          jupyter lab build
-          # Run the standard jupyterlab browser integration test
-          jupyter serverextension list 1>serverextensions 2>&1
-          cat serverextensions | grep "jupyterlab_git.*OK"
-          jupyter labextension list 1>labextensions 2>&1
-          cat labextensions | grep "@jupyterlab/git.*OK"
+
+          python -m pip uninstall -y jupyterlab-git
+
+          # Integration test
+          python -m pip install .
+          jupyter server extension list 2>&1 | grep -ie "jupyterlab_git.*OK"
+
+          jupyter labextension list 2>&1 | grep -ie "@jupyterlab/git.*OK"
           python -m jupyterlab.browser_check
           # Run our extension-specific browser integration test
-          python tests/test-browser/run_browser_test.py
+          # python tests/test-browser/run_browser_test.py

.gitignore

@@ -1,39 +1,42 @@
-# os junk
-.DS_Store
-
-# yarn/typescript build junk
-package-lock.json
+*.bundle.*
+lib/
+node_modules/
+*.egg-info/
+.ipynb_checkpoints
 *.tsbuildinfo
+jupyterlab_git/labextension
+
+# Created by https://www.gitignore.io/api/python
+# Edit at https://www.gitignore.io/?templates=python
 
+### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
-.pytest_cache/
 
 # C extensions
 *.so
 
 # Distribution / packaging
-*.egg
-*.egg-info/
-.eggs/
-.installed.cfg
 .Python
-env/
 build/
 develop-eggs/
 dist/
 downloads/
 eggs/
-jupyterlab_git/labextension/*.tgz
+.eggs/
 lib/
 lib64/
-MANIFEST
 parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
+share/python-wheels/
+.installed.cfg
+*.egg
+MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -48,26 +51,20 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
 *.pot
 
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
 # Scrapy stuff:
 .scrapy
 
@@ -104,12 +101,26 @@ ENV/
 # Rope project settings
 .ropeproject
 
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
 # mkdocs documentation
 /site
 
 # mypy
 .mypy_cache/
-node_modules/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# End of https://www.gitignore.io/api/python
+
+# OSX files
+.DS_Store
 
 # jetbrains ide stuff
 *.iml
@@ -122,5 +133,5 @@ node_modules/
 
 # vim stuff
 *.swp
-.devcontainer/
+
 src/version.ts

.prettierignore

@@ -2,3 +2,4 @@ node_modules
 **/node_modules
 **/lib
 **/package.json
+jupyterlab_git

.prettierrc

@@ -1,3 +1,5 @@
 {
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "none",
+  "arrowParens": "avoid"
 }

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-You can contribute in many ways to move this project forwrad.
+You can contribute in many ways to move this project forward.
 
 While anyone can contribute, only [Team Members](https://github.com/jupyterlab/jupyterlab-git#team) can merge in pull requests
 or add labels to issues.

LICENSE

@@ -1,7 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Project Jupyter Contributors
-All rights reserved.
+Copyright (c) 2020, Jupyter Development Team All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

MANIFEST.in

@@ -1,7 +1,19 @@
 include LICENSE
 include README.md
+include pyproject.toml
+include jupyter-config/jupyterlab_git.json
 
-include setupbase.py
+include package.json
+include install.json
+include ts*.json
+
+graft jupyterlab_git/labextension
+
+# Javascript files
+graft src
+graft style
+prune **/node_modules
+prune lib
 
 # Patterns to exclude from any directory
 global-exclude *~