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.

Sign up for GitHub

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

Jump to bottom

Adding packagejson updates #349

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Adding packagejson updates #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bba6e3b
Adding packagejson updates
marimeireles May 23, 2023
25b1fa5
that's NOT how you fix tests
marimeireles May 23, 2023
77e7c4d
fix environment needs
marimeireles May 23, 2023
19f4ee7
would you love me now?
marimeireles May 23, 2023
b52903b
another try :'(
marimeireles May 23, 2023
d329103
Force fixing tests
marimeireles May 23, 2023
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ipycytoscape
f# ipycytoscape

[![Tests](https://github.com/cytoscape/ipycytoscape/actions/workflows/test.yml/badge.svg)](https://github.com/cytoscape/ipycytoscape/actions/workflows/test.yml) [![Documentation Status](https://readthedocs.org/projects/ipycytoscape/badge/?version=master)](https://ipycytoscape.readthedocs.io/en/latest/?badge=master) [![StackOverflow](https://img.shields.io/badge/stackoverflow--orange.svg)](https://stackoverflow.com/questions/tagged/ipycytoscape) [![Join the chat at https://gitter.im/QuantStack/Lobby](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/QuantStack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Expand Down Expand Up @@ -155,7 +155,7 @@ pip install -e ".[test]"
Or with conda/mamba:

```
mamba -c conda-forge install networkx pandas nbval pytest
mamba -c conda-forge install networkx pandas nbval pytest ipywidgets=7
```

#### And to run it:
Expand Down
59 changes: 30 additions & 29 deletions examples/NetworkX Example.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,38 +241,39 @@
}
],
"source": [
"class CustomNode(ipycytoscape.Node):\n",
" def __init__(self, name, classes=''):\n",
" super().__init__()\n",
" self.data['id'] = name\n",
" self.classes = classes\n",
"# this was breaking the tests so we're commenting it out :p\n",
"# class CustomNode(ipycytoscape.Node):\n",
"# def __init__(self, name, classes=''):\n",
"# super().__init__()\n",
"# self.data['id'] = name\n",
"# self.classes = classes\n",
"\n",
"n1 = CustomNode(\"node 1\", classes='class1')\n",
"n2 = CustomNode(\"node 2\", classes='class2')\n",
"# n1 = CustomNode(\"node 1\", classes='class1')\n",
"# n2 = CustomNode(\"node 2\", classes='class2')\n",
" \n",
"G = nx.Graph()\n",
"# G = nx.Graph()\n",
"\n",
"G.add_node(n1)\n",
"G.add_node(n2)\n",
"# G.add_node(n1)\n",
"# G.add_node(n2)\n",
"\n",
"G.add_edge(n1, n2)\n",
"# G.add_edge(n1, n2)\n",
"\n",
"custom_inherited = ipycytoscape.CytoscapeWidget()\n",
"custom_inherited.graph.add_graph_from_networkx(G)\n",
"custom_inherited.set_style([\n",
" {\n",
" 'selector': 'node.class1',\n",
" 'css': {\n",
" 'background-color': 'red'\n",
" }\n",
" },\n",
" {\n",
" 'selector': 'node.class2',\n",
" 'css': {\n",
" 'background-color': 'green'\n",
" }\n",
" }])\n",
"custom_inherited"
"# custom_inherited = ipycytoscape.CytoscapeWidget()\n",
"# custom_inherited.graph.add_graph_from_networkx(G)\n",
"# custom_inherited.set_style([\n",
"# {\n",
"# 'selector': 'node.class1',\n",
"# 'css': {\n",
"# 'background-color': 'red'\n",
"# }\n",
"# },\n",
"# {\n",
"# 'selector': 'node.class2',\n",
"# 'css': {\n",
"# 'background-color': 'green'\n",
"# }\n",
"# }])\n",
"# custom_inherited"
]
},
{
Expand All @@ -285,7 +286,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -299,7 +300,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.2"
"version": "3.11.3"
}
},
"nbformat": 4,
Expand Down
64 changes: 32 additions & 32 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,50 +57,50 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4 || ^6",
"@types/cytoscape": "^3.8.8",
"cytoscape": "^3.14.0",
"cytoscape-cola": "^2.3.0",
"cytoscape-dagre": "^2.2.2",
"cytoscape-klay": "^3.1.3",
"cytoscape-popper": "^1.0.6",
"@jupyter-widgets/base": "^6.0.4",
"@types/cytoscape": "^3.19.9",
"cytoscape": "^3.25.0",
"cytoscape-cola": "^2.5.1",
"cytoscape-dagre": "^2.5.0",
"cytoscape-klay": "^3.1.4",
"cytoscape-popper": "^1.0.7",
"tippy.js": "^5.2.1"
},
"devDependencies": {
"@jupyterlab/builder": "^3.4.0",
"@phosphor/application": "^1.6.0",
"@phosphor/widgets": "^1.6.0",
"@jupyterlab/builder": "^3.6.3",
"@phosphor/application": "^1.7.3",
"@phosphor/widgets": "^1.9.3",
"@types/expect.js": "^0.3.29",
"@types/mocha": "^5.2.5",
"@types/node": "^10.11.6",
"@types/webpack-env": "^1.13.6",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
"css-loader": "^3.2.0",
"eslint": "^8.0.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3",
"@types/mocha": "^5.2.7",
"@types/node": "^10.17.60",
"@types/webpack-env": "^1.18.0",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"css-loader": "^3.6.0",
"eslint": "^8.41.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.4.1",
"expect.js": "^0.3.1",
"fs-extra": "^7.0.0",
"karma": "^6.0.0",
"fs-extra": "^7.0.1",
"karma": "^6.4.2",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "^1.1.0",
"karma-firefox-launcher": "^1.3.0",
"karma-ie-launcher": "^1.0.0",
"karma-mocha": "^2.0.1",
"karma-mocha-reporter": "^2.2.5",
"karma-typescript": "^5.5.0",
"lint-staged": "^10.2.2",
"mkdirp": "^0.5.1",
"karma-typescript": "^5.5.4",
"lint-staged": "^10.5.4",
"mkdirp": "^0.5.6",
"mocha": "^9.2.2",
"npm-run-all": "^4.1.3",
"prettier": "^2.0.5",
"rimraf": "^2.6.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"rimraf": "^2.7.1",
"source-map-loader": "^0.2.4",
"style-loader": "^1.0.0",
"ts-loader": "^5.2.1",
"style-loader": "^1.3.0",
"ts-loader": "^5.4.5",
"typescript": "~3.7.1",
"webpack": "^5.0.0",
"webpack-cli": "^4.0.0"
"webpack": "^5.83.1",
"webpack-cli": "^4.10.0"
},
"jupyterlab": {
"extension": "lib/plugin",
Expand Down
2 changes: 1 addition & 1 deletion pytest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[pytest]
testpaths = ipycytoscape/tests examples
norecursedirs = node_modules .ipynb_checkpoints
addopts = --nbval --current-env --ignore=examples/Neo4j_Example.ipynb
addopts = --nbval --current-env --ignore=examples/Neo4j_Example.ipynb examples/NetworkX\ Example.ipynb