Prepare release on pypi.org

Author: fcollonval

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Install node
       uses: actions/setup-node@v1
       with:
-       node-version: '10.x'
+       node-version: '14.x'
     - name: Install Python
       uses: actions/setup-python@v2
       with:

.github/workflows/publish.yml

@@ -12,19 +12,24 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "14.x"
           registry-url: "https://registry.npmjs.org"
       - name: Install Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: "3.x"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install jupyterlab~=2.0
+          python -m pip pip install jupyterlab~=3.0
       - name: Build and publish NPM package
         run: |
-          npm install
+          jlpm
           npm publish --access=public
+          
+          python setup.py sdist bdist_wheel
+          twine upload dist/*
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}

README.md

@@ -1,10 +1,10 @@
-# jlab_enhanced_launcher
+# jlab-enhanced-launcher
 
-![Github Actions Status](https://github.com/fcollonval/jlab-enhanced-launcher/workflows/Build/badge.svg) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/fcollonval/jlab-enhanced-launcher.git/master?urlpath=lab) [![npm](https://img.shields.io/npm/v/@jlab-enhanced/launcher)](https://www.npmjs.com/package/@jlab-enhanced/launcher)
+![Github Actions Status](https://github.com/fcollonval/jlab-enhanced-launcher/workflows/Build/badge.svg) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/fcollonval/jlab-enhanced-launcher/master?urlpath=lab) [![npm](https://img.shields.io/npm/v/@jlab-enhanced/launcher)](https://www.npmjs.com/package/@jlab-enhanced/launcher) [![PyPI](https://img.shields.io/pypi/v/jlab-enhanced-launcher)](https://pypi.org/project/jlab-enhanced-launcher)
 
 A enhanced launcher for JupyterLab.
 
-![Demo](enh_launcher.gif)
+![Demo](https://raw.githubusercontent.com/fcollonval/jlab-enhanced-launcher/master/enh_launcher.gif)
 
 This codes started from https://github.com/jupyterlab/jupyterlab/pull/5953.
 
@@ -16,24 +16,28 @@ This codes started from https://github.com/jupyterlab/jupyterlab/pull/5953.
 
 ```bash
 pip install jlab-enhanced-launcher
+jupyter labextension disable @jupyterlab/launcher-extension
 ```
 
 or
 
 ```bash
 conda install jlab-enhanced-launcher
+jupyter labextension disable @jupyterlab/launcher-extension
 ```
 
 ### Uninstall
 
 ```bash
 pip uninstall jlab-enhanced-launcher
+jupyter labextension enable @jupyterlab/launcher-extension
 ```
 
 or
 
 ```bash
 conda remove jlab-enhanced-launcher
+jupyter labextension enable @jupyterlab/launcher-extension
 ```
 
 ## Contributing
@@ -51,6 +55,7 @@ The `jlpm` command is JupyterLab's pinned version of
 # Change directory to the jlab_enhanced_launcher directory
 # Install package in development mode
 pip install -e .
+jupyter labextension disable @jupyterlab/launcher-extension
 # Link your development version of the extension with JupyterLab
 jupyter labextension develop . --overwrite
 # Rebuild extension Typescript source after making changes

jlab_enhanced_launcher/_version.py

@@ -3,13 +3,14 @@
 def _fetchVersion():
     import json
     import pathlib
+    from packaging.version import parse
 
     HERE = pathlib.Path(__file__).parent.absolute()
 
     for d in HERE.rglob('package.json'): 
         try:
             with d.open() as f:
-                return json.load(f)['version']
+                return str(parse(json.load(f)['version']))
         except FileNotFoundError:
             pass
 

setup.py

@@ -4,11 +4,12 @@
 import json
 import os
 
+import setuptools
 from jupyter_packaging import (
     create_cmdclass, install_npm, ensure_targets,
     combine_commands, skip_if_exists
 )
-import setuptools
+from packaging.version import parse
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
@@ -17,7 +18,7 @@
 
 # Get our version
 with open(os.path.join(HERE, 'package.json')) as f:
-    version = json.load(f)['version']
+    version = str(parse(json.load(f)['version']))
 
 lab_path = os.path.join(HERE, name, "labextension")
 
@@ -27,7 +28,7 @@
 ]
 
 package_data_spec = {
-    name: [
+    name.replace("_", "-"): [
         "*"
     ]
 }
@@ -70,6 +71,7 @@
     packages=setuptools.find_packages(),
     install_requires=[
         "jupyterlab>=3.0.0rc13,==3.*",
+        "packaging"
     ],
     zip_safe=False,
     include_package_data=True,
@@ -84,6 +86,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Framework :: Jupyter",
     ],
 )