Skip to content

Commit

Permalink
instance: upate invenio to 3.2, improve harvesting
Browse files Browse the repository at this point in the history
* Updates invenio to version 3.2.
* Bumps ES to version 7.
* Uses Postgress 12
* Adds XSL style to OAI2D.
* Implements deletion of resource links for unavailable ebooks during
  harvesting.
* Uses poetry.

Co-Authored-by: Peter Weber <[email protected]>
  • Loading branch information
rerowep and rerowep committed Jul 22, 2020
1 parent 75d03b6 commit e25b581
Show file tree
Hide file tree
Showing 46 changed files with 13,984 additions and 10,198 deletions.
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ env:
- E2E_OUTPUT=base64
# Enable end-to-end tests
- E2E=no
# Enable Europe/Zurich timezone
- TZ="Europe/Zurich"
matrix:
- REQUIREMENTS=prod
- REQUIREMENTS=qa
- REQUIREMENTS="--deploy" E2E=yes
- REQUIREMENTS=""

python:
- "3.6"
Expand All @@ -66,14 +68,15 @@ before_install:
# Chrome webdriver for Selenium
- "PATH=$PATH:$HOME/webdrivers"
- "if [ ${E2E} == 'yes' ] && [ ! -f $HOME/webdrivers/chromedriver ]; then wget https://chromedriver.storage.googleapis.com/2.31/chromedriver_linux64.zip -P $HOME/webdrivers; unzip -d $HOME/webdrivers $HOME/webdrivers/chromedriver_linux64.zip; fi"
- "nvm install 6; nvm use 6"
- "travis_retry pip install --upgrade setuptools py pipenv==2018.10.9"
- "nvm install 8; nvm use 8"
- "travis_retry pip install --upgrade setuptools py poetry"
- "travis_retry pip install twine wheel coveralls"
# patch default version of travis which is mark as unsave by pipenv check
# patch default version of travis which is mark as unsave by safety check
- "travis_retry pip install --upgrade numpy"

install:
- "./scripts/bootstrap --ci"
- "poetry show" # To have details about installed libs (isort, pytest, etc.)

before_script:
# https://docs.travis-ci.com/user/gui-and-headless-browsers/
Expand All @@ -83,7 +86,7 @@ before_script:
- "./docker/wait-for-services.sh"

script:
- ./run-tests.sh # E2E tests are skipped if E2E env is set to 'no'
- poetry run run-tests # E2E tests are skipped if E2E env is set to 'no'

after_success:
- coveralls
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ RUN chown -R invenio:invenio ${WORKING_DIR}

USER 1000

# workaround
RUN rm -rf /invenio/src/ui/admin/node_modules
RUN npm uninstall --prefix `pipenv --venv` --silent -g node-sass clean-css uglify-js requirejs
RUN npm uninstall --prefix `poetry env info -p` --silent -g node-sass clean-css uglify-js requirejs

ENV INVENIO_COLLECT_STORAGE='flask_collect.storage.file'
RUN ./scripts/bootstrap --deploy
RUN poetry run bootstrap --deploy
7 changes: 5 additions & 2 deletions Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,17 @@ FROM python:3.6-slim-stretch
# require debian packages
RUN apt-get update -y && apt-get upgrade -y
RUN apt-get install --no-install-recommends -y git vim-tiny curl gcc gnupg libc6-dev && rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade setuptools wheel pip pipenv
RUN pip install --upgrade setuptools wheel pip poetry

# # uwsgi uwsgitop uwsgi-tools

# Install Node
#RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
#RUN apt-get install --no-install-recommends -y nodejs && rm -rf /var/lib/apt/lists/*
#RUN npm install --silent [email protected] [email protected] [email protected] [email protected]
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get install --no-install-recommends -y nodejs && rm -rf /var/lib/apt/lists/*
RUN npm install --silent node-sass@4.9.0 clean-css@3.4.19 uglify-js@2.7.3 requirejs@2.2.0 @angular/[email protected]
RUN npm install --silent node-sass@4.14.1 clean-css[email protected] uglify-js@3.9.4 requirejs@2.3.6

# RUN npm update

Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,6 @@ include Pipfile
recursive-include rero_ebooks *.png
recursive-include rero_ebooks *.scss
recursive-include rero_ebooks *.py
recursive-include rero_ebooks *.xsl
recursive-include tests *.json
recursive-include tests *.yml
57 changes: 0 additions & 57 deletions Pipfile

This file was deleted.

Loading

0 comments on commit e25b581

Please sign in to comment.