Skip to content

Commit

Permalink
rebrand from HolgerGraef/MSM to hgrf/racine (#155)
Browse files Browse the repository at this point in the history
* rebrand from HolgerGraef/MSM to hgrf/racine (first part of issue #59)
* coding style: black
  • Loading branch information
hgrf committed Mar 9, 2023
1 parent 28f0c71 commit 178508b
Show file tree
Hide file tree
Showing 32 changed files with 156 additions and 158 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
run: docker-compose run web python -m pytest

- name: Export image
run: docker save --output /tmp/dockerimage.tar holgergraef/msm
run: docker save --output /tmp/dockerimage.tar hgrf/racine

# https://docs.docker.com/build/ci/github-actions/examples/#share-built-image-between-jobs
- name: Upload artifact
Expand Down Expand Up @@ -114,14 +114,11 @@ jobs:
- name: Login to DockerHub
run: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin

- name: Push to DockerHub
run: docker push holgergraef/msm

- name: Login to ghcr
run: echo ${{ github.token }} | docker login ghcr.io -u HolgerGraef --password-stdin
run: echo ${{ github.token }} | docker login ghcr.io -u hgrf --password-stdin

- name: Tag image for ghcr
run: docker tag holgergraef/msm:latest ghcr.io/holgergraef/msm:latest
run: docker tag hgrf/racine:latest ghcr.io/hgrf/racine:latest

- name: Push to ghcr
run: docker push ghcr.io/holgergraef/msm:latest
run: docker push ghcr.io/hgrf/racine:latest
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ignore all "backup" files created by gedit
*~
# ignore log file
msm.log
racine.log
# ignore virtual environment files
venv/*
# ignore PyCharm specific files
Expand Down
30 changes: 15 additions & 15 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
Software License Agreement
==========================

Mercury Sample Manager - A collaborative lab book in your web browser.
Racine - A collaborative lab book in your web browser.

Copyright (c) 2015-2022 Holger Graef. All rights reserved.
Copyright (c) 2015-2023 Holger Graef. All rights reserved.

Licensed under the terms of the GNU General Public License version 3:
http://www.gnu.org/licenses/gpl.html (see also Appendix A).

Sources of Intellectual Property included in Mercury Sample Manager
-------------------------------------------------------------------
Sources of Intellectual Property included in Racine
---------------------------------------------------

Where not otherwise indicated, all Mercury Sample Manager content is authored by
Holger Graef. The following libraries are included in Mercury Sample Manager
Where not otherwise indicated, all Racine content is authored by
Holger Graef. The following libraries are included in Racine
under the GPL license (see Appendix A):

* CKEditor 4 - Copyright (c) 2003-2019, CKSource - Frederico Knabben.

The image rotate plugin is based on madis' work (https://ckeditor.com/cke4/addon/imagerotate),
released under the GPL license (see Appendix A).

The following libraries are included in Mercury Sample Manager under the MIT license
The following libraries are included in Racine under the MIT license
(see Appendix B):

* jQuery and jQueryUI - Copyright (c) jQuery Foundation and other contributors.
Expand All @@ -29,23 +29,23 @@ The following libraries are included in Mercury Sample Manager under the MIT lic
* bootstrap-toc.min.js and bootstrap-toc.min.css - Copyright (c) 2015-2016 Aidan Feldman.
* Lightbox2 - Copyright (c) 2015 Lokesh Dhakar.

The following libraries are included in Mercury Sample Manager under the Apache license
The following libraries are included in Racine under the Apache license
(see Appendix C):

* MathJax - Copyright (c) MathJax Consortium, "a joint venture of the American Mathematical Society
(AMS) and the Society for Industrial and Applied Mathematics (SIAM)".

The following icons from the Open Icon Library (https://sourceforge.net/projects/openiconlibrary/)
are included in Mercury Sample Manager under various open source licenses:
are included in Racine under various open source licenses:

* archive.png, collaborative.png, dearchive.png, delete.png, edit.png, file.png, folder.png,
folder_inaccessible.png, insertimage.png, non-collaborative.png, resource.png, sample.png,
upload.png, user.png

External sources of Intellectual Property used by Mercury Sample Manager
------------------------------------------------------------------------
External sources of Intellectual Property used by Racine
--------------------------------------------------------

The following external libraries are used by Mercury Sample Manager under the BSD 3-Clause
The following external libraries are used by Racine under the BSD 3-Clause
license (see Appendix D):

* Flask - Copyright (c) 2010, Pallets (and related libraries: Flask-SQLAlchemy, werkzeug,
Expand All @@ -60,7 +60,7 @@ license (see Appendix D):
* GitPython - Copyright (c) 2008, 2009 Michael Trier and contributors.
* WTForms - Copyright (c) 2008 by the WTForms team.

The following external libraries are used by Mercury Sample Manager under the MIT license
The following external libraries are used by Racine under the MIT license
(see Appendix B):

* blinker - Copyright (c) The Blinker authors and contributors.
Expand All @@ -75,13 +75,13 @@ The following external libraries are used by Mercury Sample Manager under the MI
* visitor - Copyright (c) 2015 Marc Brinkmann.
* urllib3 - Copyright (c) 2008-2019 Andrey Petrov and contributors.

The following external libraries are used by Mercury Sample Manager under the Apache
The following external libraries are used by Racine under the Apache
license (see Appendix C):

* requests - Copyright 2019 Kenneth Reitz.
* python-editor

The following external libraries are used by Mercury Sample Manager under other
The following external libraries are used by Racine under other
licenses:

* Pillow - https://raw.githubusercontent.com/python-pillow/Pillow/master/LICENSE
Expand Down
54 changes: 27 additions & 27 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ website:
# build website
cd build/bootstrap && hugo --cleanDestinationDir

# copy build to MSM
# copy build to Racine
rm -rf ./_site
cp -r build/bootstrap/_site ./_site

Expand Down Expand Up @@ -106,47 +106,47 @@ install-ckeditor:
# /tmp/ckeditor4/dev/builder/release/ckeditor/skins/moono-lisa

# apply patch to image plugin
# c.f. https://github.com/HolgerGraef/MSM/commit/0cb962ec38ab3ea627bf2ed9f92d46f3ca2b27d2
# https://github.com/HolgerGraef/MSM/commit/7bebdfd730a61df0cdcbc04d9711e11ef3b80cbf
# https://github.com/HolgerGraef/MSM/commit/e98b8fa093778f0a1331f1d4b56619d669f9e8a5
# https://github.com/HolgerGraef/MSM/commit/cac9cf5bd1cba27551b3335998692a9ba072e29e
# https://github.com/HolgerGraef/MSM/commit/b2940d7d35fd2a725f88d394e815c1bc57f6d10f
# https://github.com/HolgerGraef/MSM/commit/276a495413d6654cad1695cd1ef33daa558f3fa7
# https://github.com/HolgerGraef/MSM/commit/3f33c7f58e41eec70f8749d756aaae5f5755a348
# https://github.com/HolgerGraef/MSM/commit/7791aa8db771323ed8a1997beb50ddc17583b460
# c.f. https://github.com/hgrf/racine/commit/0cb962ec38ab3ea627bf2ed9f92d46f3ca2b27d2
# https://github.com/hgrf/racine/commit/7bebdfd730a61df0cdcbc04d9711e11ef3b80cbf
# https://github.com/hgrf/racine/commit/e98b8fa093778f0a1331f1d4b56619d669f9e8a5
# https://github.com/hgrf/racine/commit/cac9cf5bd1cba27551b3335998692a9ba072e29e
# https://github.com/hgrf/racine/commit/b2940d7d35fd2a725f88d394e815c1bc57f6d10f
# https://github.com/hgrf/racine/commit/276a495413d6654cad1695cd1ef33daa558f3fa7
# https://github.com/hgrf/racine/commit/3f33c7f58e41eec70f8749d756aaae5f5755a348
# https://github.com/hgrf/racine/commit/7791aa8db771323ed8a1997beb50ddc17583b460
cp patches/image.patch /tmp/ckeditor4/plugins/image/plugin.patch
cd /tmp/ckeditor4 && git apply plugins/image/plugin.patch
rm /tmp/ckeditor4/plugins/image/plugin.patch

# apply patch to imagerotate plugin
# c.f. https://github.com/HolgerGraef/MSM/commit/627937daf81687278c8d339fa1bfaf0a1e71caa8
# https://github.com/HolgerGraef/MSM/commit/56471eaf168d4f34e930368f95e8b330b4bb8d90
# https://github.com/HolgerGraef/MSM/commit/109e8c57fbb0655245160cc42e0bc1d871c9dabd
# https://github.com/HolgerGraef/MSM/commit/e9af7953866a6f26fd30a96f3293f2be0d192ce3
# c.f. https://github.com/hgrf/racine/commit/627937daf81687278c8d339fa1bfaf0a1e71caa8
# https://github.com/hgrf/racine/commit/56471eaf168d4f34e930368f95e8b330b4bb8d90
# https://github.com/hgrf/racine/commit/109e8c57fbb0655245160cc42e0bc1d871c9dabd
# https://github.com/hgrf/racine/commit/e9af7953866a6f26fd30a96f3293f2be0d192ce3
cp patches/imagerotate/plugin.patch /tmp/ckeditor4/plugins/imagerotate/plugin.patch
cd /tmp/ckeditor4/plugins/imagerotate && git apply plugin.patch
rm /tmp/ckeditor4/plugins/imagerotate/plugin.patch

# apply patch to link plugin
# c.f. https://github.com/HolgerGraef/MSM/commit/0cb962ec38ab3ea627bf2ed9f92d46f3ca2b27d2
# https://github.com/HolgerGraef/MSM/commit/7bebdfd730a61df0cdcbc04d9711e11ef3b80cbf
# https://github.com/HolgerGraef/MSM/commit/22e0ae16e74488dea63e59a69bb3d74aaac3b972
# https://github.com/HolgerGraef/MSM/commit/cac9cf5bd1cba27551b3335998692a9ba072e29e
# https://github.com/HolgerGraef/MSM/commit/b2940d7d35fd2a725f88d394e815c1bc57f6d10f
# https://github.com/HolgerGraef/MSM/commit/7791aa8db771323ed8a1997beb50ddc17583b460
# c.f. https://github.com/hgrf/racine/commit/0cb962ec38ab3ea627bf2ed9f92d46f3ca2b27d2
# https://github.com/hgrf/racine/commit/7bebdfd730a61df0cdcbc04d9711e11ef3b80cbf
# https://github.com/hgrf/racine/commit/22e0ae16e74488dea63e59a69bb3d74aaac3b972
# https://github.com/hgrf/racine/commit/cac9cf5bd1cba27551b3335998692a9ba072e29e
# https://github.com/hgrf/racine/commit/b2940d7d35fd2a725f88d394e815c1bc57f6d10f
# https://github.com/hgrf/racine/commit/7791aa8db771323ed8a1997beb50ddc17583b460
cp patches/link.patch /tmp/ckeditor4/plugins/link/plugin.patch
cd /tmp/ckeditor4 && git apply plugins/link/plugin.patch
rm /tmp/ckeditor4/plugins/link/plugin.patch

# apply patch to save plugin
# c.f. https://github.com/HolgerGraef/MSM/commit/e98b8fa093778f0a1331f1d4b56619d669f9e8a5
# https://github.com/HolgerGraef/MSM/commit/cac9cf5bd1cba27551b3335998692a9ba072e29e
# https://github.com/HolgerGraef/MSM/commit/0f6fe60cd646d7e95b0330b246ad7c7c1b968aae
# c.f. https://github.com/hgrf/racine/commit/e98b8fa093778f0a1331f1d4b56619d669f9e8a5
# https://github.com/hgrf/racine/commit/cac9cf5bd1cba27551b3335998692a9ba072e29e
# https://github.com/hgrf/racine/commit/0f6fe60cd646d7e95b0330b246ad7c7c1b968aae
cp patches/save/plugin.patch /tmp/ckeditor4/plugins/save/plugin.patch
cd /tmp/ckeditor4 && git apply plugins/save/plugin.patch
rm /tmp/ckeditor4/plugins/save/plugin.patch

# copy build to MSM
# copy build to Racine
rm -rf app/static/ckeditor
cp -r /tmp/ckeditor4/dev/builder/release/ckeditor app/static/ckeditor

Expand Down Expand Up @@ -256,7 +256,7 @@ install-jquery.jeditable:

wget -O app/static/jquery.jeditable.js https://sscdn.net/js/jquery/latest/jeditable/1.7.1/jeditable.js

# c.f. https://github.com/HolgerGraef/MSM/commit/89d8b57e795ccfbeb73dc18faecc1d0016a8a008#diff-5f8e3a2bd35e7f0079090b176e06d0568d5c8e4468c0febbfa61014d72b16246
# c.f. https://github.com/hgrf/racine/commit/89d8b57e795ccfbeb73dc18faecc1d0016a8a008#diff-5f8e3a2bd35e7f0079090b176e06d0568d5c8e4468c0febbfa61014d72b16246
git apply patches/jquery.jeditable.patch

install-jquery-ui:
Expand Down Expand Up @@ -300,9 +300,9 @@ install-typeahead:
cp -r /tmp/typeahead.js/dist app/static/typeahead.js
rm -rf /tmp/typeahead.js

# c.f. https://github.com/HolgerGraef/MSM/commit/19fc41b1797112d2980b08ad53d1f945d9e36b17
# c.f. https://github.com/hgrf/racine/commit/19fc41b1797112d2980b08ad53d1f945d9e36b17
# https://github.com/twitter/typeahead.js/issues/1218
# https://github.com/HolgerGraef/MSM/commit/2d892a4a2f6a9bdb9465730a64670277e35698a8
# https://github.com/hgrf/racine/commit/2d892a4a2f6a9bdb9465730a64670277e35698a8
git apply patches/typeahead.patch

wget -O yuicompressor.jar https://github.com/yui/yuicompressor/releases/download/v2.4.8/yuicompressor-2.4.8.jar
Expand Down Expand Up @@ -425,7 +425,7 @@ doc:
--cleanup \
--create-configs \
--theme material \
--name "Mercury Sample Manager" \
--name "Racine" \
--output-path docsmd \
app

Expand Down
Loading

0 comments on commit 178508b

Please sign in to comment.