Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade versions #202

Merged
merged 20 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ executors:
password: $DASH_PAT_DOCKERHUB
node-executor:
docker:
- image: cimg/node:20.5.1
- image: cimg/python:3.11.7-node
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
Expand All @@ -21,9 +21,9 @@ executors:
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
python-3-6-executor:
python-3-8-executor:
docker:
- image: cimg/python:3.6.15-browsers
- image: cimg/python:3.8.18-browsers
auth:
username: dashautomation
password: $DASH_PAT_DOCKERHUB
Expand All @@ -41,6 +41,14 @@ jobs:
name: Install package.json
command: npm i

- run:
name: Install tests/requirements.txt
command: pip install -r tests/requirements.txt

- run:
name: Run build
command: npm run build:all

- save_cache:
key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
paths:
Expand Down Expand Up @@ -119,9 +127,9 @@ jobs:
pytest --headless tests/test_percy_snapshot.py
when: always

python-3-6:
python-3-8:
<<: *test-template
executor: python-3-6-executor
executor: python-3-8-executor

environment:
PERCY_ENABLE: False
Expand All @@ -139,7 +147,7 @@ workflows:
build:
jobs:
- python-3-11
- python-3-6
- python-3-8
- python-3-11-react-18
- node
- percy-finalize:
Expand Down
6 changes: 3 additions & 3 deletions dash_cytoscape/dash_cytoscape.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_cytoscape/dash_cytoscape.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dash_cytoscape/dash_cytoscape_extra.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_cytoscape/dash_cytoscape_extra.min.js

Large diffs are not rendered by default.

38 changes: 18 additions & 20 deletions dash_cytoscape/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,35 +48,33 @@
"cytoscape-spread": "^3.0.0",
"cytoscape-svg": "0.4.0",
"lodash": "^4.17.21",
"ramda": "^0.29.0",
"react": ">=16",
"ramda": "^0.29.1",
"react-cytoscapejs": "2.0.0",
"react-dom": ">=16",
"uuid": "^9.0.0"
"uuid": "^9.0.1"
},
"devDependencies": {
"@babel/core": "^7.23.0",
"@babel/eslint-parser": "^7.22.15",
"@babel/preset-env": "^7.22.20",
"@babel/preset-react": "^7.22.15",
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "^7.23.3",
"@babel/preset-env": "^7.23.8",
"@babel/preset-react": "^7.23.3",
"babel-loader": "^9.1.3",
"copyfiles": "^2.4.1",
"css-loader": "^6.8.1",
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"css-loader": "^6.9.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.33.2",
"npm": "^10.1.0",
"prettier": "^3.0.3",
"npm": "^10.4.0",
"prettier": "^3.2.4",
"react-docgen": "^5.3.0",
"style-loader": "^3.3.3",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4"
"style-loader": "^3.3.4",
"webpack": "^5.90.0",
"webpack-cli": "^5.1.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"peerDependencies": {
"react": ">=16",
"react-dom": ">=16",
"webpack": "^5.88.2",
"webpack": "^5.90.0",
"webpack-cli": "^5.1.4"
},
"engines": {
Expand Down
16 changes: 8 additions & 8 deletions demos/usage_cy_leaflet_aio.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
html.Div(
cyto.CyLeaflet(
id="my-cy-leaflet",
cytoscape_props=dict(
elements=[],
stylesheet=cy_stylesheet,
),
cytoscape_props={
"elements": [],
"stylesheet": cy_stylesheet,
},
width=int(default_div_style["width"][:-2]),
height=int(default_div_style["height"][:-2]),
),
Expand Down Expand Up @@ -133,10 +133,10 @@ def update_location(location, width, height):
return (
cyto.CyLeaflet(
id="my-cy-leaflet",
cytoscape_props=dict(
elements=new_elements,
stylesheet=cy_stylesheet,
),
cytoscape_props={
"elements": new_elements,
"stylesheet": cy_stylesheet,
},
width=width,
height=height,
),
Expand Down
6 changes: 3 additions & 3 deletions deps/dash_cytoscape.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deps/dash_cytoscape.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions deps/dash_cytoscape_extra.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deps/dash_cytoscape_extra.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions inst/deps/dash_cytoscape.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/dash_cytoscape.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions inst/deps/dash_cytoscape_extra.dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/deps/dash_cytoscape_extra.min.js

Large diffs are not rendered by default.

Loading