Merge pull request #193 from Farkites/lint-format

Apply eslint, prettier, and black

Author: Farkites

.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": ["env", "react"]
+  "presets": ["@babel/preset-env", "@babel/preset-react"]
 }

.circleci/config.yml

@@ -1,141 +1,147 @@
-version: 2
+version: '2.1'
+orbs:
+    browser-tools: circleci/browser-tools@1.4.6
 
-jobs:
-    "percy-finalize":
+executors:
+    percy-executor:
         docker:
             - image: percyio/agent
               auth:
-                username: dashautomation
-                password: $DASH_PAT_DOCKERHUB
-        steps:
-            - run: percy finalize --all
-    "node":
+                  username: dashautomation
+                  password: $DASH_PAT_DOCKERHUB
+    node-executor:
         docker:
-            - image: circleci/node:8.11.3
+            - image: cimg/node:20.5.1
               auth:
                   username: dashautomation
                   password: $DASH_PAT_DOCKERHUB
-                  
+    python-3-11-executor:
+        docker:
+            - image: cimg/python:3.11.5-browsers
+              auth:
+                  username: dashautomation
+                  password: $DASH_PAT_DOCKERHUB
+    python-3-6-executor:
+        docker:
+            - image: cimg/python:3.6.15-browsers
+              auth:
+                  username: dashautomation
+                  password: $DASH_PAT_DOCKERHUB
+
+jobs:
+    percy-finalize:
+        executor: percy-executor
+        steps:
+            - run: percy finalize --all
+    node:
+        executor: node-executor
         steps:
             - checkout
-
-            - restore_cache:
-                key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
-
             - run:
-                name: Install package.json
-                command: npm i
+                  name: Install package.json
+                  command: npm i
 
             - save_cache:
-                key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
-                paths:
-                    - node_modules
+                  key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
+                  paths:
+                      - node_modules
 
             - run:
-                name: Run eslint
-                command: ./node_modules/.bin/eslint src
-                when: always
+                  name: Run eslint
+                  command: npm run lint.eslint
+                  when: always
 
+            - run:
+                  name: Run prettier
+                  command: npm run lint.prettier
+                  when: always
+
+    python-3-11: &test-template
+        executor: python-3-11-executor
 
-    "python-3.6": &test-template
-        docker:
-            - image: circleci/python:3.6-stretch-browsers
-              auth:
-                  username: dashautomation
-                  password: $DASH_PAT_DOCKERHUB
-                  
         environment:
             PERCY_ENABLED: True
             PERCY_PARALLEL_TOTAL: -1
 
         steps:
             - checkout
+            - browser-tools/install-chrome
+            - browser-tools/install-chromedriver
 
             - restore_cache:
-                key: deps1-{{ .Branch }}-{{ checksum "tests/requirements.txt" }}
+                  key: deps1-{{ .Branch }}-{{ checksum "tests/requirements.txt" }}
 
             - run:
-                name: Create virtualenv
-                command: |
-                    python3 -m venv venv
+                  name: Create virtualenv
+                  command: rm -rf venv && python -m venv venv
 
             - run:
-                name: Install requirements
-                command: |
-                    . venv/bin/activate
-                    pip install -r tests/requirements.txt --quiet
+                  name: Install requirements
+                  command: . venv/bin/activate && pip install -r tests/requirements.txt
 
             - save_cache:
-                key: deps1-{{ .Branch }}-{{ checksum "tests/requirements.txt" }}
-                paths:
-                    - "venv"
-
-            - run:
-                name: Run pylint
-                command: |
-                    . venv/bin/activate
-                    pylint usage.py usage-advanced.py usage-elements.py usage-events.py usage-stylesheet.py
-                    pylint demos tests
-                when: always
+                  key: deps1-{{ .Branch }}-{{ checksum "tests/requirements.txt" }}
+                  paths:
+                      - 'venv'
 
             - run:
-                name: Run flake8
-                command: |
-                    . venv/bin/activate
-                    flake8 --max-line-length=100 usage.py usage-advanced.py usage-elements.py usage-events.py usage-stylesheet.py
-                    flake8 --max-line-length=100 demos tests
-                when: always
+                  name: Run lint for Python files
+                  command: |
+                      . venv/bin/activate
+                      npm run lint:python
+                  when: always
 
             - run:
-                name: Integration Tests - Usage Apps Rendering
-                command: |
-                    . venv/bin/activate
-                    pytest --nopercyfinalize --headless tests/test_usage.py
-                when: always
+                  name: Integration Tests - Usage Apps Rendering
+                  command: |
+                      . venv/bin/activate
+                      pytest --nopercyfinalize --headless tests/test_usage.py
+                  when: always
 
             - run:
-                name: Integration Tests - Interactions
-                command: |
-                    . venv/bin/activate
-                    pytest --headless tests/test_interactions.py
-                when: always
+                  name: Integration Tests - Interactions
+                  command: |
+                      . venv/bin/activate
+                      pytest --headless tests/test_interactions.py
+                  when: always
 
             - run:
-                name: Integration Tests - Callbacks
-                command: |
-                    . venv/bin/activate
-                    pytest --headless tests/test_callbacks.py
-                when: always
+                  name: Integration Tests - Callbacks
+                  command: |
+                      . venv/bin/activate
+                      pytest --headless tests/test_callbacks.py
+                  when: always
 
             - run:
-                name: Capture Percy Snapshots
-                command: |
-                    . venv/bin/activate
-                    pytest --headless tests/test_percy_snapshot.py
-                when: always
+                  name: Capture Percy Snapshots
+                  command: |
+                      . venv/bin/activate
+                      pytest --headless tests/test_percy_snapshot.py
+                  when: always
 
-    "python-3.7":
+    python-3-6:
         <<: *test-template
-        docker:
-            - image: circleci/python:3.7-stretch-browsers
-              auth:
-                  username: dashautomation
-                  password: $DASH_PAT_DOCKERHUB
-                  
+        executor: python-3-6-executor
+
         environment:
             PERCY_ENABLE: False
 
+    python-3-11-react-18:
+        <<: *test-template
+        executor: python-3-11-executor
+
+        environment:
+            PERCY_ENABLE: False
+            REACT_VERSION: '18.2.0'
 
 workflows:
-    version: 2
+    version: 2.1
     build:
         jobs:
-            - "python-3.6":
-                context: dash-docker-hub
-            - "python-3.7":
-                context: dash-docker-hub
-            - "node":
-                context: dash-docker-hub
-            - "percy-finalize":
-                requires:
-                    - "python-3.6"
+            - python-3-11
+            - python-3-6
+            - python-3-11-react-18
+            - node
+            - percy-finalize:
+                  requires:
+                      - python-3-11

.eslintrc

@@ -1,7 +1,8 @@
 {
-  "extends": ["eslint:recommended", "prettier"],
-  "parser": "babel-eslint",
+  "extends": ["eslint:recommended", "prettier", "plugin:react/recommended"],
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
+    "requireConfigFile": false,
     "ecmaVersion": 6,
     "sourceType": "module",
     "ecmaFeatures": {
@@ -117,5 +118,10 @@
         "ignore": [-1, 0, 1, 2, 3, 100, 10, 0.5]
     }],
     "no-underscore-dangle": ["off"]
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
   }
 }

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+extend-ignore = E203, E501

.github/ISSUE_TEMPLATE.md

@@ -18,16 +18,15 @@ it's usually helpful to mention the browser and version that you are using.
 #### Description
 
 #### Steps/Code to Reproduce
+
 <!--
 Example:
 ```python
 import dash
 import dash_cytoscape as cyto
-import dash_html_components as html
+from dash import html
 
 app = dash.Dash(__name__)
-app.scripts.config.serve_locally = True
-app.css.config.serve_locally = True
 
 app.layout = html.Div([
     cyto.Cytoscape(
@@ -49,25 +48,25 @@ it in the issue: https://gist.github.com
 -->
 
 #### Expected Results
+
 <!-- Please paste or describe the expected results.-->
 
 #### Actual Results
+
 <!-- Please paste or specifically describe the actual output or traceback. -->
 
 #### Versions
+
 <!--
 Please run the following snippet and paste the output below:
 
 from __future__ import print_function
 import dash; print("Dash", dash.__version__)
-import dash_html_components; print("Dash Core Components", dash_html_components.__version__)
-import dash_core_components; print("Dash HTML Components", dash_core_components.__version__)
 import dash_renderer; print("Dash Renderer", dash_renderer.__version)
-import dash_cytoscape; print("Dash HTML Components", dash_cytoscape.__version__)
+import dash_cytoscape; print("Dash Cytoscape", dash_cytoscape.__version__)
 -->
 
-
-<!-- 
-Thanks for taking the time to help up improve this component. Dash Cytoscape 
+<!--
+Thanks for taking the time to help up improve this component. Dash Cytoscape
 would not be possible without awesome contributors like you!
  -->

.pylintrc

@@ -318,13 +318,6 @@ max-line-length=100
 # Maximum number of lines in a module
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 2023-09-27 
+
+### Added
+* `prettier` and `black` lint/format scripts have been added.
+* React 18 job has been added to circleCI workflow.
+
+### Changed
+* Dash has been upgraded to 2.* in requirements.txt and tests/requirements.txt.
+* Dependencies have been upgraded to lastest versions.
+* CircleCI workflow has been updated to version 2.1.
+* Python version in CircleCI workflow has been updated to 3.11.
+* Node version in CircleCI workflow has been updated to 20.5.1.
+
+### Fixed
+* CircleCI workflow has been fixed. 
+
 ## [0.3.0] - 2021-05-19 
 
 ### Added

Project.toml

@@ -9,4 +9,4 @@ Dash = "1b08a953-4be3-4667-9a23-3db579824955"
 
 [compat]
 julia = "1.2"
-Dash = "0.1.3"
+Dash = "0.1.3, 1.0"

R/cytoCytoscape.R

@@ -1,5 +1,6 @@
 # AUTO GENERATED FILE - DO NOT EDIT
 
+#' @export
 cytoCytoscape <- function(id=NULL, autoRefreshLayout=NULL, autolock=NULL, autoungrabify=NULL, autounselectify=NULL, boxSelectionEnabled=NULL, className=NULL, elements=NULL, generateImage=NULL, imageData=NULL, layout=NULL, maxZoom=NULL, minZoom=NULL, mouseoverEdgeData=NULL, mouseoverNodeData=NULL, pan=NULL, panningEnabled=NULL, responsive=NULL, selectedEdgeData=NULL, selectedNodeData=NULL, style=NULL, stylesheet=NULL, tapEdge=NULL, tapEdgeData=NULL, tapNode=NULL, tapNodeData=NULL, userPanningEnabled=NULL, userZoomingEnabled=NULL, zoom=NULL, zoomingEnabled=NULL) {
 
     props <- list(id=id, autoRefreshLayout=autoRefreshLayout, autolock=autolock, autoungrabify=autoungrabify, autounselectify=autounselectify, boxSelectionEnabled=boxSelectionEnabled, className=className, elements=elements, generateImage=generateImage, imageData=imageData, layout=layout, maxZoom=maxZoom, minZoom=minZoom, mouseoverEdgeData=mouseoverEdgeData, mouseoverNodeData=mouseoverNodeData, pan=pan, panningEnabled=panningEnabled, responsive=responsive, selectedEdgeData=selectedEdgeData, selectedNodeData=selectedNodeData, style=style, stylesheet=stylesheet, tapEdge=tapEdge, tapEdgeData=tapEdgeData, tapNode=tapNode, tapNodeData=tapNodeData, userPanningEnabled=userPanningEnabled, userZoomingEnabled=userZoomingEnabled, zoom=zoom, zoomingEnabled=zoomingEnabled)