Skip to content

Commit

Permalink
Release 2.0.2 (#96)
Browse files Browse the repository at this point in the history
* Canvas test failures #91
fixed workflows
fixed dockerfile for binder

* Fix unknown entity warnings (#90)

* fixed workflows
fixed dockerfile for binder

* fixed dockerfile for binder

* fixed dockerfile for binder

* fixed dockerfile for binder

* fixed package info

* fix for #92 #93 and #94
added new workflow for releasetools

* revert changes from latest jupyterlab extension cookiecutter

* use yarn instead of npm

* workaround for yarn caches on subprojects: from actions/setup-node#488 (comment)

* workaround for yarn caches on subprojects: from actions/setup-node#488 (comment)

* new release 2.0.2 to test ReleaseTools

---------

Co-authored-by: Manuel Martins <Manuel.Martins@ecmwf.int>
Co-authored-by: Jerry James <loganjerry@gmail.com>
  • Loading branch information
3 people authored Mar 2, 2023
1 parent ce2639f commit d7276cf
Show file tree
Hide file tree
Showing 17 changed files with 318 additions and 160 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/NPM_PYPI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@ jobs:
working-directory: js
- run: yarn run build:prod
working-directory: js
- name: Publish Browser extension
- name: Configure npm
run: |
npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
npm publish --no-workspaces
working-directory: js/packages/francy-extension-browser
working-directory: js
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Publish Browser extension
run: npm publish --no-workspaces
working-directory: js/packages/francy-extension-browser
- run: python -m build --wheel --sdist
working-directory: js/packages/francy-extension-jupyterlab
- name: Publish Jupyterlab extension PyPI
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/RELEASE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:
- run: yarn run docs
working-directory: js
- name: GAPTools Release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
run: |
# Clone Release tools
git clone --depth=2 -b master https://github.com/gap-system/ReleaseTools $HOME/ReleaseTools
Expand All @@ -68,10 +70,5 @@ jobs:
git worktree add gh-pages gh-pages
# Copy JavaScript documentation
cp -rf doc/js gh-pages/doc/
# Configure git
git config user.name "GitHub Actions Bot"
git config user.email "<>"
git config github.user "GitHub Actions Bot"
git config github.token "${{ secrets.GITHUB_TOKEN }}"
# Run Release Script
GAP="$HOME/gap/bin/gap.sh" $HOME/ReleaseTools/release-gap-package --push
GAP="$HOME/gap/bin/gap.sh" bash -x $HOME/ReleaseTools/release-gap-package --force --push --token ${GH_TOKEN}
2 changes: 1 addition & 1 deletion PackageInfo.g
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SetPackageInfo(rec(

PackageName := "francy",
Subtitle := "Framework for Interactive Discrete Mathematics",
Version := "2.0.1",
Version := "2.0.2",
Date := "25/01/2023", # dd/mm/yyyy format
License := "MIT",

Expand Down
2 changes: 1 addition & 1 deletion js/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ mcmartins@local:~$ pip install -U jupyterlab-francy
<html>
<head>
<meta charset="utf-8" content="text/html" property="GAP,francy,d3.v7,graphviz,vis">
<script src="https://unpkg.com/francy-extension-browser@2.0.1/dist/main.js"></script>
<script src="https://unpkg.com/francy-extension-browser@2.0.2/dist/main.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,6 +1,6 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "2.0.1",
"version": "2.0.2",
"npmClient": "yarn",
"useWorkspaces": true
}
26 changes: 13 additions & 13 deletions js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "francy-js",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Renders [application/vnd.francy+json] MIME Type on Jupyter Environments.",
"repository": {
Expand All @@ -22,23 +22,23 @@
"coverage": "yarn run test"
},
"devDependencies": {
"@babel/cli": "^7.20.7",
"@babel/core": "^7.20.12",
"@babel/cli": "^7.21.0",
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.19.1",
"@babel/eslint-plugin": "^7.19.1",
"@babel/plugin-proposal-decorators": "^7.20.13",
"@babel/plugin-transform-classes": "^7.20.7",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/plugin-transform-classes": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
"@hpcc-js/wasm": "^2.8.0",
"@jupyterlab/builder": "^3.6.1",
"@jupyterlab/notebook": "^3.6.1",
"@jupyterlab/rendermime": "^3.6.1",
"@swc/core": "^1.3.35",
"@swc/core": "^1.3.37",
"babel-loader": "^9.1.2",
"chai": "^4.3.7",
"chai-string": "^1.5.0",
"core-js": "^3.28.0",
"core-js": "^3.29.0",
"css-loader": "^6.7.3",
"d3": "^7.8.2",
"d3-array": "^3.2.2",
Expand All @@ -56,7 +56,7 @@
"d3-shape": "^3.2.0",
"d3-transition": "^3.0.1",
"d3-zoom": "^3.0.0",
"eslint": "^8.34.0",
"eslint": "^8.35.0",
"file-loader": "^6.2.0",
"jsdoc": "^4.0.2",
"json-loader": "^0.5.7",
Expand All @@ -71,17 +71,17 @@
"lerna": "^6.5.1",
"lodash.isequal": "^4.5.0",
"lodash.reduce": "^4.6.0",
"mkdirp": "^2.1.3",
"mkdirp": "^2.1.4",
"mocha": "^10.2.0",
"npm-run-all": "^4.1.5",
"process": "^0.11.10",
"puppeteer": "^19.7.1",
"rimraf": "^4.1.2",
"puppeteer": "^19.7.2",
"rimraf": "^4.1.3",
"save-svg-as-png": "^1.4.17",
"seedrandom": "^3.0.5",
"style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.3.6",
"vis-network": "^9.1.2",
"vis-network": "^9.1.4",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"yarn": "^1.22.19"
Expand Down
2 changes: 1 addition & 1 deletion js/packages/build-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "build-config",
"description": "Webpack build configuration files shared across the project",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
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 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "francy-core",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Core library",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy-extension-browser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This extension can be used in `offline` mode in a web page as follows:
<html>
<head>
<meta charset="utf-8" content="text/html" property="GAP,francy,d3.v7,graphviz,vis,vis">
<script src="https://unpkg.com/francy-extension-browser@2.0.1/dist/main.js"></script>
<script src="https://unpkg.com/francy-extension-browser@2.0.2/dist/main.js"></script>
<title>Francy</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion 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": "2.0.1",
"version": "2.0.2",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Browser Extension",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy-extension-jupyterlab/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "jupyterlab-francy",
"version": "2.0.1",
"version": "2.0.2",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - Jupyter Lab Extension",
"keywords": [
"gap",
Expand Down
4 changes: 2 additions & 2 deletions js/packages/francy-extension-jupyterlab/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
]
version = "2.0.1"
version = "2.0.2"

[project.license]
file = "LICENSE"
Expand Down Expand Up @@ -88,7 +88,7 @@ file = [
]

[tool.tbump.version]
current = "2.0.1"
current = "2.0.2"
regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"

[tool.tbump.git]
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy-renderer-d3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "francy-renderer-d3",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - A D3.js Renderer",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy-renderer-graphviz/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "francy-renderer-graphviz",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - A Graphviz Renderer",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy-renderer-vis/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "francy-renderer-vis",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP - A Vis.js Renderer",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
Expand Down
2 changes: 1 addition & 1 deletion js/packages/francy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "2.0.1",
"version": "2.0.2",
"name": "francy",
"description": "Francy - An Interactive Discrete Mathematics Framework for GAP",
"author": "Manuel Martins <manuelmachadomartins@gmail.com>",
Expand Down
Loading

0 comments on commit d7276cf

Please sign in to comment.