From dc1767749169f4a98e20dcf1b09f4a86debacb66 Mon Sep 17 00:00:00 2001 From: Ryan Patrick Kyle Date: Tue, 18 May 2021 18:33:30 -0400 Subject: [PATCH 1/6] chore: use build:backends --- package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e2766c49..6a3e7a46 100644 --- a/package.json +++ b/package.json @@ -21,10 +21,8 @@ "build:js-dev-extra": "webpack --config webpack.dev.extra.config.js", "build:js-extra": "webpack --config webpack.prod.extra.config.js", "build:js-all": "npm run build:js && npm run build:js-dev && npm run build:js-dev-extra && npm run build:js-extra", - "build:py": "dash-generate-components ./src/lib/components dash_cytoscape", - "build:py-activated": "(. venv/bin/activate || venv\\scripts\\activate && npm run build:py)", - "build:r": "dash-generate-components ./src/lib/components dash_cytoscape --r-prefix='cyto'", - "build:all": "npm run build:js-all && npm run build:py", + "build:backends": "dash-generate-components ./src/lib/components dash_cytoscape -p package-info.json --r-prefix 'cyto' --jl-prefix 'cyto'", + "build:all": "npm run build:js-all && npm run build:backends", "build:all-activated": "(. venv/bin/activate || venv\\scripts\\activate && npm run build:all)" }, "author": "The Plotly Team ", From fd45e7e43ecbd763bf5c3d4ef9be60378625c398 Mon Sep 17 00:00:00 2001 From: Ryan Patrick Kyle Date: Fri, 21 May 2021 12:29:09 -0400 Subject: [PATCH 2/6] chore: ver => 0.3.0; master already updated --- dash_cytoscape/package-info.json | 75 ++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 dash_cytoscape/package-info.json diff --git a/dash_cytoscape/package-info.json b/dash_cytoscape/package-info.json new file mode 100644 index 00000000..97f8563f --- /dev/null +++ b/dash_cytoscape/package-info.json @@ -0,0 +1,75 @@ +{ + "name": "dash-cytoscape", + "version": "0.3.0", + "description": "A Component Library for Dash aimed at facilitating network visualization in Python, wrapped around Cytoscape.js", + "repository": { + "type": "git", + "url": "git://github.com/plotly/dash-cytoscape.git" + }, + "bugs": { + "url": "https://github.com/plotly/dash-cytoscape/issues" + }, + "homepage": "https://github.com/plotly/dash-cytoscape", + "main": "build/index.js", + "scripts": { + "start": "webpack-serve ./webpack.serve.config.js --open", + "validate-init": "python _validate_init.py", + "lint:test": "eslint src", + "lint": "eslint src --fix", + "build:js-dev": "webpack --mode development", + "build:js": "webpack --mode production", + "build:js-dev-extra": "webpack --config webpack.dev.extra.config.js", + "build:js-extra": "webpack --config webpack.prod.extra.config.js", + "build:js-all": "npm run build:js && npm run build:js-dev && npm run build:js-dev-extra && npm run build:js-extra", + "build:backends": "dash-generate-components ./src/lib/components dash_cytoscape -p package-info.json --r-prefix 'cyto' --jl-prefix 'cyto'", + "build:all": "npm run build:js-all && npm run build:backends", + "build:all-activated": "(. venv/bin/activate || venv\\scripts\\activate && npm run build:all)" + }, + "author": "The Plotly Team ", + "author-email": "cytoscape@plotly.com", + "license": "MIT", + "dependencies": { + "cytoscape-cola": "^2.3.0", + "cytoscape-cose-bilkent": "^4.0.0", + "cytoscape-dagre": "^2.2.2", + "cytoscape-euler": "^1.2.1", + "cytoscape-klay": "^3.1.2", + "cytoscape-spread": "^3.0.0", + "cytoscape-svg": "0.2.0", + "lodash": "^4.17.11", + "ramda": "^0.25.0", + "react": "^16.14.0", + "react-cytoscapejs": "1.2.1", + "react-dom": "^16.14.0" + }, + "devDependencies": { + "babel-core": "^6.26.3", + "babel-eslint": "^8.2.3", + "babel-loader": "^7.1.4", + "babel-preset-env": "^1.7.0", + "babel-preset-react": "^6.24.1", + "copyfiles": "^2.0.0", + "css-loader": "^0.28.11", + "eslint": "^4.19.1", + "eslint-config-prettier": "^2.9.0", + "eslint-plugin-import": "^2.12.0", + "eslint-plugin-react": "^7.9.1", + "npm": "^6.14.4", + "react-docgen": "^5.3.0", + "style-loader": "^0.21.0", + "webpack": "^4.20.2", + "webpack-cli": "^3.1.1", + "webpack-serve": "^1.0.2" + }, + "peerDependencies": { + "react": ">=0.14", + "react-dom": ">=0.14", + "webpack": "^4.20.2", + "webpack-cli": "^3.1.1", + "webpack-serve": "^1.0.2" + }, + "engines": { + "node": ">=8.11.0", + "npm": ">=6.1.0" + } +} diff --git a/package.json b/package.json index 6a3e7a46..97f8563f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dash-cytoscape", - "version": "0.2.0", + "version": "0.3.0", "description": "A Component Library for Dash aimed at facilitating network visualization in Python, wrapped around Cytoscape.js", "repository": { "type": "git", From b4ed208c1dcb8d1492dff81c913358e75c882181 Mon Sep 17 00:00:00 2001 From: Ryan Patrick Kyle Date: Wed, 19 May 2021 13:16:13 -0400 Subject: [PATCH 3/6] chore: update CHANGELOG.md --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60675c23..e665d3b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,11 @@ 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). -## [Unreleased] +## [0.3.0] - 2021-05-19 + +### Added +* Contributed initial build of Julia package. +* R package now includes an example application for `cytoCytoscape`. ### Changed * Dash has been upgraded to 1.* in requirements.txt and tests/requirements.txt (#123) @@ -15,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed * Various security fixes -## [0.2.0] - 20120-07-09 +## [0.2.0] - 2020-07-09 ### Added * Contributed initial build of R package. From 480307956944762d20e4e9021ced02f4fd3ec097 Mon Sep 17 00:00:00 2001 From: xhlulu Date: Tue, 25 May 2021 12:26:07 -0400 Subject: [PATCH 4/6] Change the package.json loaded in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 364f90dd..f46278b1 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages -with open(os.path.join('dash_cytoscape', 'package.json')) as f: +with open('package.json') as f: package = json.load(f) package_name = package["name"].replace(" ", "_").replace("-", "_") From 8f0e12391ac061e2043bedb39bcac0c2d36d827e Mon Sep 17 00:00:00 2001 From: xhlulu Date: Tue, 25 May 2021 12:27:13 -0400 Subject: [PATCH 5/6] Remove old package.json --- dash_cytoscape/package.json | 77 ------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 dash_cytoscape/package.json diff --git a/dash_cytoscape/package.json b/dash_cytoscape/package.json deleted file mode 100644 index e2766c49..00000000 --- a/dash_cytoscape/package.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "name": "dash-cytoscape", - "version": "0.2.0", - "description": "A Component Library for Dash aimed at facilitating network visualization in Python, wrapped around Cytoscape.js", - "repository": { - "type": "git", - "url": "git://github.com/plotly/dash-cytoscape.git" - }, - "bugs": { - "url": "https://github.com/plotly/dash-cytoscape/issues" - }, - "homepage": "https://github.com/plotly/dash-cytoscape", - "main": "build/index.js", - "scripts": { - "start": "webpack-serve ./webpack.serve.config.js --open", - "validate-init": "python _validate_init.py", - "lint:test": "eslint src", - "lint": "eslint src --fix", - "build:js-dev": "webpack --mode development", - "build:js": "webpack --mode production", - "build:js-dev-extra": "webpack --config webpack.dev.extra.config.js", - "build:js-extra": "webpack --config webpack.prod.extra.config.js", - "build:js-all": "npm run build:js && npm run build:js-dev && npm run build:js-dev-extra && npm run build:js-extra", - "build:py": "dash-generate-components ./src/lib/components dash_cytoscape", - "build:py-activated": "(. venv/bin/activate || venv\\scripts\\activate && npm run build:py)", - "build:r": "dash-generate-components ./src/lib/components dash_cytoscape --r-prefix='cyto'", - "build:all": "npm run build:js-all && npm run build:py", - "build:all-activated": "(. venv/bin/activate || venv\\scripts\\activate && npm run build:all)" - }, - "author": "The Plotly Team ", - "author-email": "cytoscape@plotly.com", - "license": "MIT", - "dependencies": { - "cytoscape-cola": "^2.3.0", - "cytoscape-cose-bilkent": "^4.0.0", - "cytoscape-dagre": "^2.2.2", - "cytoscape-euler": "^1.2.1", - "cytoscape-klay": "^3.1.2", - "cytoscape-spread": "^3.0.0", - "cytoscape-svg": "0.2.0", - "lodash": "^4.17.11", - "ramda": "^0.25.0", - "react": "^16.14.0", - "react-cytoscapejs": "1.2.1", - "react-dom": "^16.14.0" - }, - "devDependencies": { - "babel-core": "^6.26.3", - "babel-eslint": "^8.2.3", - "babel-loader": "^7.1.4", - "babel-preset-env": "^1.7.0", - "babel-preset-react": "^6.24.1", - "copyfiles": "^2.0.0", - "css-loader": "^0.28.11", - "eslint": "^4.19.1", - "eslint-config-prettier": "^2.9.0", - "eslint-plugin-import": "^2.12.0", - "eslint-plugin-react": "^7.9.1", - "npm": "^6.14.4", - "react-docgen": "^5.3.0", - "style-loader": "^0.21.0", - "webpack": "^4.20.2", - "webpack-cli": "^3.1.1", - "webpack-serve": "^1.0.2" - }, - "peerDependencies": { - "react": ">=0.14", - "react-dom": ">=0.14", - "webpack": "^4.20.2", - "webpack-cli": "^3.1.1", - "webpack-serve": "^1.0.2" - }, - "engines": { - "node": ">=8.11.0", - "npm": ">=6.1.0" - } -} From 6a6dc7c43b41f3df3df8b632f65acdccfd0ec136 Mon Sep 17 00:00:00 2001 From: xhlulu Date: Tue, 25 May 2021 12:37:27 -0400 Subject: [PATCH 6/6] Add more directories to npmignore --- .npmignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.npmignore b/.npmignore index dce48325..b5033466 100644 --- a/.npmignore +++ b/.npmignore @@ -24,3 +24,12 @@ venv .travis.yml CHANGELOG.md README.md +demos +*__pycache__* +build +.vscode +tests +dist +usage* +.circleci +.github \ No newline at end of file