Skip to content

Commit

Permalink
version bump for release
Browse files Browse the repository at this point in the history
  • Loading branch information
mcmartins committed May 17, 2019
1 parent 9c943de commit 3802f26
Show file tree
Hide file tree
Showing 22 changed files with 82 additions and 82 deletions.
4 changes: 2 additions & 2 deletions PackageInfo.g
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ SetPackageInfo(rec(

PackageName := "Francy",
Subtitle := "Framework for Interactive Discrete Mathematics",
Version := "1.2.3",
Date := "14/05/2019", # dd/mm/yyyy format
Version := "1.2.4",
Date := "17/05/2019", # dd/mm/yyyy format
License := "MIT",

Persons := [
Expand Down
6 changes: 3 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Follow the git flow:
```bash
mcmartins@local:~$ git checkout develop # just to make sure
mcmartins@local:~$ git flow init # all defaults except the tag prefix that should be 'v'
mcmartins@local:~$ git flow release start 1.2.3
mcmartins@local:~$ git flow release start 1.2.4
mcmartins@local:~$ git checkout master
mcmartins@local:~$ git merge release/1.2.3
mcmartins@local:~$ git flow release finish '1.2.3'
mcmartins@local:~$ git merge release/1.2.4
mcmartins@local:~$ git flow release finish '1.2.4'
mcmartins@local:~$ git push
mcmartins@local:~$ git push --tags
```
8 changes: 4 additions & 4 deletions js/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ mcmartins@local:~$ jupyter labextension install jupyter-francy
<script src="https://unpkg.com/d3-graphviz@2.6.1/build/d3-graphviz.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" />
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/FrancyJS.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/D3Renderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/GraphvizRenderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/VisRenderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/FrancyJS.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/D3Renderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/GraphvizRenderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/VisRenderer.bundle.js"></script>
<title>Francy</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion js/lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.3",
"version": "1.2.4",
"npmClient": "npm",
"npmClientArgs": [
"--no-lockfile",
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy-core",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Core library",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions js/packages/francy-extension-browser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ This extension can be used in `offline` mode in a web page as follows:
<script src="https://unpkg.com/d3-graphviz@2.6.1/build/d3-graphviz.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css" />
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/FrancyJS.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/D3Renderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/GraphvizRenderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.3/dist/VisRenderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/FrancyJS.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/D3Renderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/GraphvizRenderer.bundle.js"></script>
<script src="https://unpkg.com/francy-extension-browser@1.2.4/dist/VisRenderer.bundle.js"></script>
<title>Francy</title>
</head>
<body>
Expand Down
12 changes: 6 additions & 6 deletions js/packages/francy-extension-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy-extension-browser",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Browser Extension",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand All @@ -16,13 +16,12 @@
"license": "MIT",
"main": "index.js",
"dependencies": {
"francy": "^1.2.3",
"francy-renderer-d3": "^1.2.3",
"francy-renderer-graphviz": "^1.2.3",
"francy-renderer-vis": "^1.2.3"
"francy": "^1.2.4",
"francy-renderer-d3": "^1.2.4",
"francy-renderer-graphviz": "^1.2.4",
"francy-renderer-vis": "^1.2.4"
},
"devDependencies": {
"francy-core": "^1.2.3",
"@babel/cli": "7.4.4",
"@babel/core": "7.4.4",
"@babel/plugin-proposal-decorators": "7.4.4",
Expand All @@ -33,6 +32,7 @@
"babel-loader": "8.0.6",
"css-loader": "2.1.1",
"file-loader": "3.0.1",
"francy-core": "^1.2.4",
"json-loader": "0.5.7",
"lodash.isequal": "4.5.0",
"mkdirp": "0.5.1",
Expand Down
4 changes: 2 additions & 2 deletions js/packages/francy-extension-jupyter/lab.README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ mcmartins@local:~$ jupyter labextension install jupyter-francy
```

Note:
Make sure [JupyterKenel](https://github.com/gap-packages/JupyterKernel) is installed on Jupyter.
Make sure [Francy GAP](/) is installed on GAP.
Make sure [JupyterKenel](https://github.com/gap-packages/JupyterKernel) is installed on Jupyter - JupyterKernel is distributed with GAP by default, since v4.10 :)
Make sure [Francy GAP](/) is installed on GAP - Francy is distributed with GAP by default, since v4.10 :)

# License

Expand Down
12 changes: 6 additions & 6 deletions js/packages/francy-extension-jupyter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy-extension-jupyter",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Jupyter Notebook/Lab Extension",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"main": "lib/index.js",
Expand Down Expand Up @@ -30,11 +30,11 @@
"dependencies": {
"d3": "5.9.2",
"d3-graphviz": "2.6.1",
"francy": "^1.2.3",
"francy-core": "^1.2.3",
"francy-renderer-d3": "^1.2.3",
"francy-renderer-graphviz": "^1.2.3",
"francy-renderer-vis": "^1.2.3",
"francy": "^1.2.4",
"francy-core": "^1.2.4",
"francy-renderer-d3": "^1.2.4",
"francy-renderer-graphviz": "^1.2.4",
"francy-renderer-vis": "^1.2.4",
"vis": "4.21.0",
"viz.js": "1.8.1"
},
Expand Down
6 changes: 3 additions & 3 deletions js/packages/francy-renderer-d3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy-renderer-d3",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - A D3.js Renderer",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand All @@ -19,9 +19,9 @@
},
"main": "index.js",
"dependencies": {
"francy-core": "^1.2.3"
"francy-core": "^1.2.4"
},
"devDependencies": {
"francy": "^1.2.3"
"francy": "^1.2.4"
}
}
6 changes: 3 additions & 3 deletions js/packages/francy-renderer-graphviz/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy-renderer-graphviz",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - A Graphviz Renderer",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand All @@ -15,10 +15,10 @@
],
"license": "MIT",
"dependencies": {
"francy-core": "^1.2.3"
"francy-core": "^1.2.4"
},
"devDependencies": {
"francy": "^1.2.3"
"francy": "^1.2.4"
},
"scripts": {
"test": "karma start karma.conf.js"
Expand Down
6 changes: 3 additions & 3 deletions js/packages/francy-renderer-vis/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy-renderer-vis",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - A Vis.js Renderer",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand All @@ -15,10 +15,10 @@
],
"license": "MIT",
"dependencies": {
"francy-core": "^1.2.3"
"francy-core": "^1.2.4"
},
"devDependencies": {
"francy": "^1.2.3"
"francy": "^1.2.4"
},
"scripts": {
"test": "karma start karma.conf.js"
Expand Down
4 changes: 2 additions & 2 deletions js/packages/francy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "francy",
"version": "1.2.3",
"version": "1.2.4",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand All @@ -18,7 +18,7 @@
"test": "karma start karma.conf.js"
},
"dependencies": {
"francy-core": "^1.2.3"
"francy-core": "^1.2.4"
},
"main": "index.js"
}
2 changes: 1 addition & 1 deletion notebooks/ICMS_2018.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
},
{
"data": {
"application/vnd.francy+json": "{\"version\" : \"1.2.3\",\"mime\" : \"application\\/vnd.francy+json\",\"canvas\" : {\"width\" : 800,\"id\" : \"F2\",\"height\" : 600,\"title\" : \"Subgroups Digraph of Group( [ f1, f2 ] )\",\"zoomToFit\" : true,\"texTypesetting\" : false,\"menus\" : {},\"graph\" : {\"type\" : \"directed\",\"id\" : \"F1\",\"simulation\" : true,\"collapsed\" : true,\"nodes\" : {\"F4\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F4\",\"size\" : 10,\"title\" : \"1\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F6\" : {\"id\" : \"F6\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F5\",\"trigger\" : \"click\",\"knownArgs\" : [\"1\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F7\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F7\",\"size\" : 10,\"title\" : \"2\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F9\" : {\"id\" : \"F9\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F8\",\"trigger\" : \"click\",\"knownArgs\" : [\"2\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F10\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F10\",\"size\" : 10,\"title\" : \"3\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F12\" : {\"id\" : \"F12\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F11\",\"trigger\" : \"click\",\"knownArgs\" : [\"3\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F13\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F13\",\"size\" : 10,\"title\" : \"4\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F15\" : {\"id\" : \"F15\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F14\",\"trigger\" : \"click\",\"knownArgs\" : [\"4\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F16\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F16\",\"size\" : 10,\"title\" : \"5\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F18\" : {\"id\" : \"F18\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F17\",\"trigger\" : \"click\",\"knownArgs\" : [\"5\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}}},\"links\" : {\"F19\" : {\"id\" : \"F19\",\"source\" : \"F4\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F20\" : {\"id\" : \"F20\",\"source\" : \"F7\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F21\" : {\"id\" : \"F21\",\"source\" : \"F7\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F7\",\"color\" : \"\",\"invisible\" : false},\"F22\" : {\"id\" : \"F22\",\"source\" : \"F10\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F23\" : {\"id\" : \"F23\",\"source\" : \"F10\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F10\",\"color\" : \"\",\"invisible\" : false},\"F24\" : {\"id\" : \"F24\",\"source\" : \"F13\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F25\" : {\"id\" : \"F25\",\"source\" : \"F13\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F13\",\"color\" : \"\",\"invisible\" : false},\"F26\" : {\"id\" : \"F26\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F27\" : {\"id\" : \"F27\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F7\",\"color\" : \"\",\"invisible\" : false},\"F28\" : {\"id\" : \"F28\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F10\",\"color\" : \"\",\"invisible\" : false},\"F29\" : {\"id\" : \"F29\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F13\",\"color\" : \"\",\"invisible\" : false},\"F30\" : {\"id\" : \"F30\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F16\",\"color\" : \"\",\"invisible\" : false}}},\"messages\" : {}}}"
"application/vnd.francy+json": "{\"version\" : \"1.2.4\",\"mime\" : \"application\\/vnd.francy+json\",\"canvas\" : {\"width\" : 800,\"id\" : \"F2\",\"height\" : 600,\"title\" : \"Subgroups Digraph of Group( [ f1, f2 ] )\",\"zoomToFit\" : true,\"texTypesetting\" : false,\"menus\" : {},\"graph\" : {\"type\" : \"directed\",\"id\" : \"F1\",\"simulation\" : true,\"collapsed\" : true,\"nodes\" : {\"F4\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F4\",\"size\" : 10,\"title\" : \"1\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F6\" : {\"id\" : \"F6\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F5\",\"trigger\" : \"click\",\"knownArgs\" : [\"1\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F7\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F7\",\"size\" : 10,\"title\" : \"2\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F9\" : {\"id\" : \"F9\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F8\",\"trigger\" : \"click\",\"knownArgs\" : [\"2\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F10\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F10\",\"size\" : 10,\"title\" : \"3\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F12\" : {\"id\" : \"F12\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F11\",\"trigger\" : \"click\",\"knownArgs\" : [\"3\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F13\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F13\",\"size\" : 10,\"title\" : \"4\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F15\" : {\"id\" : \"F15\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F14\",\"trigger\" : \"click\",\"knownArgs\" : [\"4\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}},\"F16\" : {\"x\" : 0,\"y\" : 0,\"type\" : \"circle\",\"id\" : \"F16\",\"size\" : 10,\"title\" : \"5\",\"layer\" : 0,\"color\" : \"\",\"parent\" : \"\",\"menus\" : {\"F18\" : {\"id\" : \"F18\",\"title\" : \"Simple\",\"callback\" : {\"func\" : \"unknown\",\"id\" : \"F17\",\"trigger\" : \"click\",\"knownArgs\" : [\"5\"],\"requiredArgs\" : {}},\"menus\" : {}}},\"messages\" : {},\"callbacks\" : {}}},\"links\" : {\"F19\" : {\"id\" : \"F19\",\"source\" : \"F4\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F20\" : {\"id\" : \"F20\",\"source\" : \"F7\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F21\" : {\"id\" : \"F21\",\"source\" : \"F7\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F7\",\"color\" : \"\",\"invisible\" : false},\"F22\" : {\"id\" : \"F22\",\"source\" : \"F10\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F23\" : {\"id\" : \"F23\",\"source\" : \"F10\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F10\",\"color\" : \"\",\"invisible\" : false},\"F24\" : {\"id\" : \"F24\",\"source\" : \"F13\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F25\" : {\"id\" : \"F25\",\"source\" : \"F13\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F13\",\"color\" : \"\",\"invisible\" : false},\"F26\" : {\"id\" : \"F26\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F4\",\"color\" : \"\",\"invisible\" : false},\"F27\" : {\"id\" : \"F27\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F7\",\"color\" : \"\",\"invisible\" : false},\"F28\" : {\"id\" : \"F28\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F10\",\"color\" : \"\",\"invisible\" : false},\"F29\" : {\"id\" : \"F29\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F13\",\"color\" : \"\",\"invisible\" : false},\"F30\" : {\"id\" : \"F30\",\"source\" : \"F16\",\"length\" : 0,\"weight\" : 0,\"target\" : \"F16\",\"color\" : \"\",\"invisible\" : false}}},\"messages\" : {}}}"
},
"execution_count": 5,
"metadata": {
Expand Down
Loading

0 comments on commit 3802f26

Please sign in to comment.