fix(lint): linting fixes

Author: sgratzl

.github/workflows/ci.yml

@@ -39,6 +39,8 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '12.x'
+      - run: npm i -g yarn
+      - run: yarn set version berry
       - name: Cache Conda
         uses: actions/cache@v1
         with:
@@ -49,7 +51,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           python-version: 3.8
-          mamba-version: "*"
+          mamba-version: '*'
           channels: conda-forge,defaults
           channel-priority: true
           activate-environment: upsetjs_jupyter_widget
@@ -58,18 +60,18 @@ jobs:
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
       - name: pytest
         shell: bash -l {0}
-        run: npm run test:p:ci
+        run: yarn test:p:ci
       - name: Lint
         shell: bash -l {0}
-        run: npm run lint:p
+        run: yarn lint:p
 
       - name: Build Notebooks
         shell: bash -l {0}
-        run: npm run nbconvert
+        run: yarn nbconvert
 
       - name: Create Docu
         shell: bash -l {0}
-        run: npm run docs:p
+        run: yarn docs:p
 
       - run: |
           mkdir -p public/integrations/jupyter

.pylintrc

@@ -6,4 +6,5 @@ disable=bad-continuation,
         line-too-long,
         duplicate-code,
         too-many-arguments,
-        too-many-ancestors
+        too-many-ancestors,
+        unsubscriptable-object

environment.yml

@@ -10,5 +10,5 @@ dependencies:
   - bumpversion
   - pytest
   - jupyter
-  - jupyterlab 
+  - jupyterlab
   - pytest-cov

package.json

@@ -45,12 +45,12 @@
     "lint": "yarn run eslint && yarn run prettier:check",
     "fix": "yarn run eslint:fix && yarn run prettier:write",
     "prettier": "prettier \"*.{md,json,yml}\" .eslintrc.js webpack* .prettierrc.js \"{src,types,scripts,.github}/**\" \"{r_package,binder}/*.yml\"",
-    "prettier:write": "yarn run prettier -- --write",
-    "prettier:check": "yarn run prettier -- --check",
-    "black": "black --target-version=py37 upsetjs_jupyter_widget setup.py setupbase.py",
+    "prettier:write": "yarn run prettier --write",
+    "prettier:check": "yarn run prettier --check",
+    "black": "black --target-version=py38 upsetjs_jupyter_widget setup.py setupbase.py",
     "eslint": "eslint src --ext .ts,.tsx",
-    "eslint:fix": "yarn run eslint -- --fix",
-    "lint:p": "mypy -p upsetjs_jupyter_widget && yarn run black -- --check && pylint upsetjs_jupyter_widget",
+    "eslint:fix": "yarn run eslint --fix",
+    "lint:p": "mypy -p upsetjs_jupyter_widget && yarn run black --check && pylint upsetjs_jupyter_widget",
     "fix:p": "yarn run black",
     "test:p": "pytest",
     "test:p:ci": "pytest --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html",

setup.py

@@ -54,7 +54,8 @@
     "jsdeps", package_data_spec=package_data_spec, data_files_spec=data_files_spec
 )
 cmdclass["jsdeps"] = combine_commands(
-    install_npm(HERE, build_cmd="build:all"), ensure_targets(jstargets),
+    install_npm(HERE, build_cmd="build:all"),
+    ensure_targets(jstargets),
 )
 
 
@@ -93,9 +94,15 @@
             "Typing :: Typed",
         ],
         include_package_data=True,
-        install_requires=["ipywidgets>=7.5.0",],
+        install_requires=[
+            "ipywidgets>=7.5.0",
+        ],
         extras_require={
-            "test": ["pytest>=3.6", "pytest-cov", "nbval",],
+            "test": [
+                "pytest>=3.6",
+                "pytest-cov",
+                "nbval",
+            ],
             "examples": [
                 # Any requirements for the examples to run
             ],

setupbase.py

@@ -61,7 +61,10 @@ def list2cmdline(cmd_list):
 SEPARATORS = os.sep if os.altsep is None else os.sep + os.altsep
 
 npm_path = ":".join(
-    [pjoin(HERE, "node_modules", ".bin"), os.environ.get("PATH", os.defpath),]
+    [
+        pjoin(HERE, "node_modules", ".bin"),
+        os.environ.get("PATH", os.defpath),
+    ]
 )
 
 if "--skip-npm" in sys.argv:
@@ -89,8 +92,7 @@ def get_version(file, name="__version__"):
 
 
 def ensure_python(specs):
-    """Given a list of range specifiers for python, ensure compatibility.
-    """
+    """Given a list of range specifiers for python, ensure compatibility."""
     if not isinstance(specs, (list, tuple)):
         specs = [specs]
     v = sys.version_info
@@ -228,7 +230,7 @@ def run(cmd, **kwargs):
 
 def is_stale(target, source):
     """Test whether the target file/directory is stale based on the source
-       file/directory.
+    file/directory.
     """
     if not os.path.exists(target):
         return True
@@ -500,8 +502,7 @@ def run(self):
 
 
 def _get_file_handler(package_data_spec, data_files_spec):
-    """Get a package_data and data_files handler command.
-    """
+    """Get a package_data and data_files handler command."""
 
     class FileHandler(BaseCommand):
         def run(self):

upsetjs_jupyter_widget/tests/conftest.py

@@ -14,8 +14,8 @@
 
 import pytest
 
-from ipykernel.comm import Comm
-from ipywidgets import Widget
+from ipykernel.comm import Comm  # type: ignore
+from ipywidgets import Widget  # type: ignore
 
 
 class MockComm(Comm):
@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
         self.log_open = []
         self.log_send = []
         self.log_close = []
-        super(MockComm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def open(self, *args, **kwargs):
         """

upsetjs_jupyter_widget/widget.py

@@ -10,9 +10,9 @@
 
 import typing as t
 
-from ipywidgets import DOMWidget, Layout, ValueWidget, register
-from ipywidgets.widgets.trait_types import Color
-from traitlets import (
+from ipywidgets import DOMWidget, Layout, ValueWidget, register  # type: ignore
+from ipywidgets.widgets.trait_types import Color  # type: ignore
+from traitlets import (  # type: ignore
     Bool,
     Dict,
     Enum,
@@ -53,7 +53,9 @@
 
 
 def _sort_sets(
-    sets: t.Sequence[UpSetSet[T]], order_by: str, limit: t.Optional[int] = None,
+    sets: t.Sequence[UpSetSet[T]],
+    order_by: str,
+    limit: t.Optional[int] = None,
 ) -> t.List[UpSetSet[T]]:
     key = None
     if order_by == "cardinality":
@@ -145,24 +147,35 @@ def _create_combination(
 ) -> UpSetSetCombination:
     if combination_type == UpSetSetType.DISTINCT_INTERSECTION:
         return UpSetSetDistinctIntersection[T](
-            cs_name, sets=sets, color=color_lookup.get(cs_name), cardinality=count,
+            cs_name,
+            sets=sets,
+            color=color_lookup.get(cs_name),
+            cardinality=count,
         )
     if combination_type == UpSetSetType.INTERSECTION:
         return UpSetSetIntersection[T](
-            cs_name, sets=sets, color=color_lookup.get(cs_name), cardinality=count,
+            cs_name,
+            sets=sets,
+            color=color_lookup.get(cs_name),
+            cardinality=count,
         )
     if combination_type == UpSetSetType.UNION:
         return UpSetSetUnion[T](
-            cs_name, sets=sets, color=color_lookup.get(cs_name), cardinality=count,
+            cs_name,
+            sets=sets,
+            color=color_lookup.get(cs_name),
+            cardinality=count,
         )
     return UpSetSetComposite[T](
-        cs_name, sets=sets, color=color_lookup.get(cs_name), cardinality=count,
+        cs_name,
+        sets=sets,
+        color=color_lookup.get(cs_name),
+        cardinality=count,
     )
 
 
 class UpSetJSBaseWidget(ValueWidget, DOMWidget, t.Generic[T]):
-    """UpSet.js Base Widget
-    """
+    """UpSet.js Base Widget"""
 
     _model_name = Unicode("UpSetModel").tag(sync=True)
     _model_module = Unicode(MODULE_NAME).tag(sync=True)
@@ -185,12 +198,14 @@ class UpSetJSBaseWidget(ValueWidget, DOMWidget, t.Generic[T]):
     elems: t.List[T] = List(default_value=[]).tag(sync=True)
     elem_to_index: t.Dict[T, int] = {}
 
-    sets: t.List[UpSetSet[T]] = List(Instance(UpSetSet), default_value=[],).tag(
-        sync=True, to_json=_to_set_list
-    )
+    sets: t.List[UpSetSet[T]] = List(
+        Instance(UpSetSet),
+        default_value=[],
+    ).tag(sync=True, to_json=_to_set_list)
 
     combinations: t.List[UpSetSetCombination[T]] = List(
-        Instance(UpSetSetCombination), default_value=[],
+        Instance(UpSetSetCombination),
+        default_value=[],
     ).tag(sync=True, to_json=_to_combination_list)
 
     value: t.Union[None, t.Mapping, t.List[int]] = Union(
@@ -424,7 +439,7 @@ def _from_dict(
         elems: t.Set[T] = set()
         for set_elems in sets.values():
             elems.update(set_elems)
-        self.elems = sorted(elems)
+        self.elems = sorted(elems)  # type: ignore
         self.elem_to_index = {e: i for i, e in enumerate(self.elems)}
         self._expression_data = False
         color_lookup = colors or {}
@@ -539,8 +554,7 @@ def to_set(name: str, series):
 
 @register
 class UpSetJSWidget(UpSetJSBaseWidget, t.Generic[T]):
-    """UpSet.js Widget
-    """
+    """UpSet.js Widget"""
 
     _render_mode = Unicode("upset").tag(sync=True)
 
@@ -706,7 +720,12 @@ def generate_distinct_intersections(
         customize the generation of the sets
         """
         set_intersections = generate_distinct_intersections(
-            self.sets, min_degree, max_degree, empty, self.elems, colors=colors,
+            self.sets,
+            min_degree,
+            max_degree,
+            empty,
+            self.elems,
+            colors=colors,
         )
 
         self.combinations = _sort_combinations(
@@ -727,7 +746,12 @@ def generate_unions(
         customize the generation of the sets
         """
         set_unions = generate_unions(
-            self.sets, min_degree, max_degree, empty, self.elems, colors=colors,
+            self.sets,
+            min_degree,
+            max_degree,
+            empty,
+            self.elems,
+            colors=colors,
         )
 
         self.combinations = _sort_combinations(set_unions, self.sets, order_by, limit)
@@ -766,7 +790,7 @@ def append_categorical_attribute(
         """
         adds another categorical UpSetAttribute to be visualized
         """
-        cats = categories if categories is not None else sorted(set(values))
+        cats = categories if categories is not None else list(sorted(set(values)))
         self.attrs = self.attrs + [
             UpSetAttribute[T]("categorical", name, values, categories=cats)
         ]
@@ -775,8 +799,7 @@ def append_categorical_attribute(
 
 @register
 class UpSetJSVennDiagramWidget(UpSetJSBaseWidget, t.Generic[T]):
-    """UpSet.js Venn Diagram Widget
-    """
+    """UpSet.js Venn Diagram Widget"""
 
     _render_mode = Unicode("venn").tag(sync=True)
 
@@ -825,7 +848,9 @@ def from_dataframe(
         return self._generate_distinct_intersections(base_sets, colors=colors)
 
     def _generate_distinct_intersections(
-        self, base_sets: t.List[UpSetSet[T]], colors: t.Mapping[str, str] = None,
+        self,
+        base_sets: t.List[UpSetSet[T]],
+        colors: t.Mapping[str, str] = None,
     ) -> "UpSetJSVennDiagramWidget":
         set_intersections = generate_distinct_intersections(
             base_sets, 1, None, True, self.elems, colors=colors
@@ -839,8 +864,7 @@ def _generate_distinct_intersections(
 
 @register
 class UpSetJSEulerDiagramWidget(UpSetJSVennDiagramWidget, t.Generic[T]):
-    """UpSet.js Euler Diagram Widget
-    """
+    """UpSet.js Euler Diagram Widget"""
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -860,8 +884,7 @@ def copy(self) -> "UpSetJSEulerDiagramWidget":
 
 @register
 class UpSetJSKarnaughMapWidget(UpSetJSBaseWidget, t.Generic[T]):
-    """UpSet.js Karnaugh Map Widget
-    """
+    """UpSet.js Karnaugh Map Widget"""
 
     _render_mode = Unicode("kmap").tag(sync=True)
 
@@ -915,7 +938,9 @@ def from_dataframe(
         return self._generate_distinct_intersections(base_sets, colors=colors)
 
     def _generate_distinct_intersections(
-        self, base_sets: t.List[UpSetSet[T]], colors: t.Mapping[str, str] = None,
+        self,
+        base_sets: t.List[UpSetSet[T]],
+        colors: t.Mapping[str, str] = None,
     ) -> "UpSetJSKarnaughMapWidget":
         set_intersections = generate_distinct_intersections(
             base_sets, 1, None, True, self.elems, colors=colors