From f84b6c1eaeaa0638d5eabe4673a0d35d83872015 Mon Sep 17 00:00:00 2001 From: kthoden Date: Wed, 27 May 2020 16:43:03 +0200 Subject: [PATCH 1/6] Update dependencies --- dependencies.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.conf b/dependencies.conf index f251756..e84eb22 100644 --- a/dependencies.conf +++ b/dependencies.conf @@ -1,9 +1,9 @@ [webdesign_platform] uri = https://github.molgen.mpg.de/EditionOpenAccess/webdesign_platform.git -hash = 3b82b76054f64ca665104df741304131c6d46067 +hash = 2b4fa1c40bc7c58548da150fda38596a1930a748 init = ./scripts/init.sh [hiviewer] uri = https://github.molgen.mpg.de/EditionOpenAccess/hyperimage_eoa.git -hash = 232328c71717d8755842248fe9c6d15ee5622f81 +hash = af67d6a46e2b95a2ede3a8ba25c00e78df00f6f4 From edce4d1bc3d6106d78abe9d808ff63b37c6ad2c8 Mon Sep 17 00:00:00 2001 From: kthoden Date: Wed, 27 May 2020 17:02:03 +0200 Subject: [PATCH 2/6] Update dependencies --- example_import/dependencies.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example_import/dependencies.conf b/example_import/dependencies.conf index 770f2c5..16f2513 100644 --- a/example_import/dependencies.conf +++ b/example_import/dependencies.conf @@ -1,10 +1,10 @@ [EOASkripts] uri = https://github.molgen.mpg.de/EditionOpenAccess/EOASkripts.git -hash = 9d04815f50968f29fb2a0b869caced67dca28a26 +hash = 6c93ab23a1f31a191a12a316d22b1cf5b9697d44 init = bash -c "git_deps_py --store-dir ../ && ./scripts/init.py --build" [eoa-publication-model] uri = https://github.molgen.mpg.de/EditionOpenAccess/eoa-publication-model.git -hash = ea8a2eb99b22703f1ef92544352701f07c08d17e +hash = d6050e814bd8e41cf63f317807c0a187193ef9de From 19435c6fd2beda193616220eb5c560dc3a9d528d Mon Sep 17 00:00:00 2001 From: kthoden Date: Wed, 27 May 2020 17:24:31 +0200 Subject: [PATCH 3/6] Temporarily deactivating eoaforthcoming, because of error See https://github.molgen.mpg.de/EditionOpenAccess/eoa-1.5/issues/3 --- requirements.txt | 2 +- src/eoa/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 40cbd88..22c8921 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ tzlocal==2.0.0 Unidecode==1.0.23 webencodings==0.5.1 git+git://github.molgen.mpg.de/EditionOpenAccess/django-eoaauthors.git@786857f108836874f73bf0812f959640c3645318 -git+git://github.molgen.mpg.de/EditionOpenAccess/django-eoaforthcoming.git@42bfb3c0d5805bbd57859daf496f3a5306e7609e +# git+git://github.molgen.mpg.de/EditionOpenAccess/django-eoaforthcoming.git@42bfb3c0d5805bbd57859daf496f3a5306e7609e git+git://github.molgen.mpg.de/EditionOpenAccess/django-eoapublications.git@c1dfa9e22ab9bb284be6863f284c47b38fd277d0 git+git://github.molgen.mpg.de/EditionOpenAccess/django-eoaseries.git@e9a82f28e57809d1ea8218ab5916ed82d38aecd4 git+git://github.molgen.mpg.de/EditionOpenAccess/django-opds.git@a76f40f9ded97ae612181063644b3741e88c87a0 diff --git a/src/eoa/settings.py b/src/eoa/settings.py index 6e65822..57e193a 100644 --- a/src/eoa/settings.py +++ b/src/eoa/settings.py @@ -65,7 +65,7 @@ 'eoa', 'eoapublications', - 'eoaforthcoming', + # 'eoaforthcoming', 'eoaseries', 'eoaauthors', 'opds', From e69d88fd3990a31e4374bf574c25daef35417ae9 Mon Sep 17 00:00:00 2001 From: kthoden Date: Wed, 27 May 2020 17:28:33 +0200 Subject: [PATCH 4/6] Fix README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 285754d..f11cb42 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,8 @@ For the example publication, this process goes as follows: 1. compiling the example +Compile the example file found in [eoa-publication-model](https://github.molgen.mpg.de/EditionOpenAccess/eoa-publication-model) + $ cd example_import $ git_deps_py --store-dir ../dependencies $ cd dependencies/EOASkripts From 6fa112467743f80da40cc88235ab534d72a5c70b Mon Sep 17 00:00:00 2001 From: kthoden Date: Wed, 27 May 2020 17:57:13 +0200 Subject: [PATCH 5/6] Fix README, update installation instructions --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f11cb42..bc039f0 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ Also a CMS superuser with username 'test' and password 'test' (don't use this in $ ./scripts/run.py && ./scripts/exec_in_container.py $ $ python manage.py loaddata $RES_DIR/fixtures/cms_dummy.json $ $ exit + $ ./scripts/stop.py ### Import Publications @@ -70,16 +71,17 @@ Compile the example file found in [eoa-publication-model](https://github.molgen. $ git_deps_py --store-dir ../dependencies $ cd dependencies/EOASkripts $ ./scripts/run.py && ./scripts/exec_in_container.py - $ $ process_eoa_latex.py -f input/example/eoatex/EOASample.tex + $ $ process_eoa_latex.py input/example/124_eoatex $ $ exit $ ./scripts/stop.py - $ cd .. + $ cd ../../../ 2. import example to the platform After you have compiled the publication to "django", you might want to import it into the platform. - $ cp -r example_import/EOASkripts/runtime/output/django res/publications/example + $ mkdir res/publications + $ cp -r example_import/EOASkripts/runtime/output/124_eoatex/django res/publications/example $ ./scripts/init.py --skip-db $ ./scripts/run.py && ./scripts/exec_in_container.py $ $ python manage.py publicationimport $RES_DIR/publications/example @@ -91,7 +93,7 @@ That's all. ### Configure Project specific Information - You might want to tweak the CMS pages: log in to the CMS and do it -- You might want to configer organisation information (org. name, logo, ...): +- You might want to configure organisation information (org. name, logo, ...): 1. edit `res/custom_config/*` 2. $ ./scripts/init.py --skip-db From aab59648d3bfa62096858ef1fed4428afb501d47 Mon Sep 17 00:00:00 2001 From: kthoden Date: Thu, 28 May 2020 09:18:12 +0200 Subject: [PATCH 6/6] Update installation instructions --- README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bc039f0..c17ef80 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Dependencies to other git repositories are handled using [git_deps_py](https://g ## Initialise the Repository $ git_deps_py - $ ./scripts/init.py [--build] + $ ./scripts/init.py --build This will pull remote repositories and resources, initialize the database, etc. Force recreating the docker image by adding `--build` e.g. if `Dockerfile` or `requirements.txt` has changed. @@ -63,9 +63,9 @@ In order to publish a publication on the platform, the following 2 steps are nec For the example publication, this process goes as follows: -1. compiling the example +1. Compile the example -Compile the example file found in [eoa-publication-model](https://github.molgen.mpg.de/EditionOpenAccess/eoa-publication-model) +Compile the example file found in [eoa-publication-model](https://github.molgen.mpg.de/EditionOpenAccess/eoa-publication-model). For other examples containing TEI-XML consult https://github.molgen.mpg.de/EditionOpenAccess/EOASkripts#the-tei-workflow-tei---pdf-django-epub. $ cd example_import $ git_deps_py --store-dir ../dependencies @@ -76,7 +76,7 @@ Compile the example file found in [eoa-publication-model](https://github.molgen. $ ./scripts/stop.py $ cd ../../../ -2. import example to the platform +2. Import example into the platform After you have compiled the publication to "django", you might want to import it into the platform. @@ -86,10 +86,15 @@ After you have compiled the publication to "django", you might want to import it $ ./scripts/run.py && ./scripts/exec_in_container.py $ $ python manage.py publicationimport $RES_DIR/publications/example $ $ exit - $ ./scripts/stop.py + +Visit http://localhost:8001/ for the main site and http://localhost:8001/studies/124/index.html for the publication. Go to http://localhost:8001/admin/login/ to access the Django administration pages. That's all. +Stop the container with + + $ ./scripts/stop.py + ### Configure Project specific Information - You might want to tweak the CMS pages: log in to the CMS and do it