From ae9d5f1a3d498063c144fd9564bac6f2e206b877 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Mon, 5 Nov 2018 14:13:38 +0100 Subject: [PATCH 1/2] Ensure that the package is created from a clean git repo --- ReleaseInstr.md | 8 ++++---- dist.sh | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ReleaseInstr.md b/ReleaseInstr.md index 956c3176e..0455603a6 100644 --- a/ReleaseInstr.md +++ b/ReleaseInstr.md @@ -22,7 +22,7 @@ in your local `SAGENB_ROOT`. cd SAGENB_ROOT git checkout master git fetch upstream - git rebase upstream/master + git rebase upstream/master ``` 1. Edit `Changes` file to highlight the main changes. Edit `setup.py` to @@ -39,7 +39,7 @@ in your local `SAGENB_ROOT`. + version = '0.10.8.3', description = 'The Sage Notebook', license = 'GNU General Public License (GPL) v3+', - author = 'William Stein et al.', + author = 'William Stein et al.', ``` 1. Commit the updated version change. @@ -63,7 +63,7 @@ in your local `SAGENB_ROOT`. ```sh cd SAGE_ROOT echo "" > build/pkgs/sagenb/package-version.txt - ./sage --fix-pkg-checksums + ./sage --package fix-checksum sagenb ./sage -tp --long --sagenb # test sagenb make ptestlong # test sage ``` @@ -78,7 +78,7 @@ in your local `SAGENB_ROOT`. 1. Check that the documentation is installed in ``$SAGE_LOCAL/share/docs/sagenb`` by e.g. opening with a browser the URL ``file://$SAGE_LOCAL/share/docs/sagenb/index.html``. - + 1. (Optional) Check that the Selenium tests pass. 1. (Optional) If you encounter errors or realize there was a mistake, diff --git a/dist.sh b/dist.sh index dc92da374..66378db88 100755 --- a/dist.sh +++ b/dist.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash -# This script creates a new tarball for SageNB. -rm -rf dist +# This script creates a new tarball for SageNB +# Remove some auto-generated packaging directories +rm -rf dist sagenb.egg-info + +# Ensure that we are packaging from a clean git repo +git clean -i -d -x + +# Now actually create the package exec ./setup.py sdist --format=bztar From 3458d16a21369cbc127d55444ba3f5eb09d33b75 Mon Sep 17 00:00:00 2001 From: Jeroen Demeyer Date: Mon, 5 Nov 2018 14:00:39 +0100 Subject: [PATCH 2/2] Update Sagenb version to 1.1.1 --- Changes | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 92eee8d45..966d81a81 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,12 @@ +1.1.1 November 5 2018 + - just of repackaging of 1.1.0 from the same sources + - in particular, remove the bundled mathjax + +1.1.0 October 18 2018 + - deprecate the Sage Notebook + - build documentation + - various improvements towards Python 3 compatibility + 1.0.3 June 10 2018 - fixed doctests for compatibility with sphinx 1.7.5 diff --git a/setup.py b/setup.py index 00abd1931..f6d9d4cd7 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def all_files(dir, prefix): setup(name='sagenb', - version = '1.1.0', + version = '1.1.1', description = 'The Sage Notebook', license = 'GNU General Public License (GPL) v3+', author = 'William Stein et al.',