Merge pull request #70 from cds-astro/fix-traitlets-warning

Fix traitlets warning

.gitignore

@@ -10,7 +10,6 @@ ipyaladin/nbextension/
 ipyaladin/labextension/
 
 # Yarn package json
-package.json
 package-lock.json
 js/yarn.lock
 js/.yarn

CHANGELOG.md

@@ -14,6 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * **Fixed** for any bug fixes.
 * **Security** in case of vulnerabilities.
 
+## [0.2.5]
+
+### Fixed
+
+* fix traitlet warning on unicode (issue #69)
+* fix warning on version export in index.js
+
 ## [0.2.4]
 
 ### Fixed

README.md

@@ -38,7 +38,7 @@ Additionny, for a jupyterlab usage you will need to:
 
 There is also a conda package that can be installed with:
 
-    conda install -c bmatthieu3 ipyaladin==0.2.4
+    conda install -c bmatthieu3 ipyaladin==0.2.5
 
 ## New features corner
 

conda-recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "ipyaladin" %}
-{% set version = "0.2.4" %}
+{% set version = "0.2.5" %}
 
 package:
   name: "{{ name|lower }}"

conda-recipe/readme

@@ -18,9 +18,9 @@ conda skeleton pypi --extra-specs jupyter-packaging ipyaladin
 // change the meta.yaml in ipyaladin/
 cp post-link.* pre-unlink.* ipyaladin
 conda build ipyaladin --output-folder distrib
-conda convert --platform all distrib/linux-64/ipyaladin-0.2.4-py39_0.tar.bz2 -o distrib
+conda convert --platform all distrib/linux-64/ipyaladin-0.2.5-py39_0.tar.bz2 -o distrib
 anaconda login
-anaconda upload distrib/osx-64/ipyaladin-0.2.4-py39_0.tar.bz2
-anaconda upload distrib/linux-64/ipyaladin-0.2.4-py39_0.tar.bz2
+anaconda upload distrib/osx-64/ipyaladin-0.2.5-py39_0.tar.bz2
+anaconda upload distrib/linux-64/ipyaladin-0.2.5-py39_0.tar.bz2
 
 rm -r distrib ipyaladin

ipyaladin/_version.py

@@ -1,4 +1,4 @@
 # Module version
-__version__ = '0.2.4'
+__version__ = '0.2.5'
 
-NPM_PACKAGE_RANGE='^0.2.4'
+NPM_PACKAGE_RANGE='^0.2.5'

ipyaladin/aladin_widget.py

@@ -106,7 +106,7 @@ class Aladin(widgets.DOMWidget):
     log = Bool(True).tag(sync=True, o=True)
     allow_full_zoomout = Bool(False).tag(sync=True, o=True)
 
-    options = List(trait=Unicode).tag(sync=True)
+    options = List(trait=Unicode()).tag(sync=True)
 
     # this sets the height of the widget
     height = Float(400).tag(sync=True)

js/lib/index.js

@@ -1,4 +1,3 @@
-// Export widget models and views, and the npm package version number.
+// Export widget models and views
 
 export {AladinModel, AladinView} from './jupyter-aladin';
-export {version} from '../package.json';

js/lib/jupyter-aladin.js

@@ -1,4 +1,6 @@
 import { DOMWidgetModel, DOMWidgetView } from '@jupyter-widgets/base';
+import packageInfo from '../package.json';
+
 // Allow us to use the DOMWidgetView base class for our models/views.
 // Additionnaly, this is where we put by default all the external libraries
 // fetched by using webpack (see webpack.config.js file).
@@ -61,11 +63,11 @@ export class AladinModel extends DOMWidgetModel {
         _model_name : 'AladinModel',
         _view_name : 'AladinView',
 
-        _model_module : 'ipyaladin',
-        _view_module : 'ipyaladin',
+        _model_module : packageInfo.name,
+        _view_module : packageInfo.name,
 
-        _model_module_version : '0.2.4',
-        _view_module_version : '0.2.4',
+        _model_module_version : packageInfo.version,
+        _view_module_version : packageInfo.version,
       };
     }
   }

js/lib/labplugin.js

@@ -1,13 +1,14 @@
-import {AladinModel, AladinView, version} from './index';
+import {AladinModel, AladinView} from './index';
 import {IJupyterWidgetRegistry} from '@jupyter-widgets/base';
+import packageInfo from '../package.json';
 
 export const aladinWidgetPlugin = {
   id: 'ipyaladin:plugin',
   requires: [IJupyterWidgetRegistry],
   activate: function(app, widgets) {
       widgets.registerWidget({
           name: 'ipyaladin',
-          version: version,
+          version: packageInfo.version,
           exports: { AladinModel, AladinView }
       });
   },

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipyaladin",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "ipyaladin",
   "author": "Thomas Boch, Jerome Desroziers and Matthieu Baumann",
   "license": "BSD-3-Clause",

setup.cfg

@@ -3,11 +3,11 @@ name = ipyaladin
 author = Jerome Desroziers, Thomas Boch & Matthieu Baumann
 author_email[email protected]
 version = attr: ipyaladin._version.__version__
-description = ipyaladin
+description = interactive viewer for astronomical surveys
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/cds-astro/ipyaladin
-keywords = ipython, aladin, astronomy, widgets, Jupyter, JupyterLab, JupyterLab3
+keywords = ipython, aladin, astronomy, widgets, Jupyter, JupyterLab, JupyterLab3, JupyterLab4
 license = BSD 3-Clause License
 project_urls =
     Bug Tracker = https://github.com/cds-astro/ipyaladin/issues