Skip to content

Commit

Permalink
invenio: version 3.3.0
Browse files Browse the repository at this point in the history
* Upgrades invenio to version 3.3.0.
* Uses Github action for tests.

Invenio-oaiserver is not functional in this version:
- inveniosoftware/invenio-oaiserver#178
- inveniosoftware/invenio-oaiserver#185
- inveniosoftware/invenio-oaiserver#186

Co-Authored-by: Peter Weber <[email protected]>
  • Loading branch information
rerowep and rerowep committed Nov 26, 2020
1 parent e25b581 commit 40aa1ca
Show file tree
Hide file tree
Showing 15 changed files with 802 additions and 731 deletions.
78 changes: 78 additions & 0 deletions .github/workflows/continuous-integration-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: build
on: [push, pull_request, workflow_dispatch]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
dependencies: ['locked', 'deploy']
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v1
with:
node-version: '12'

- name: Docker compose up
run: docker-compose up -d

- name: Set up Python 3.6
uses: actions/setup-python@v2
with:
python-version: 3.6

- name: Install Poetry
uses: snok/[email protected]
with:
version: 1.0.10

- name: Use Cache
uses: actions/cache@v2
with:
path: |
~/.cache/pip
~/.cache/pypoetry/virtualenvs
~/.npm
key: ${{ runner.os }}-pip-venv-${{ hashFiles('**/poetry.lock') }}

- name: Bootstrap locked
if: ${{ matrix.dependencies == 'locked' }}
run: |
pip install "poetry<1.1.0"
poetry run bootstrap --ci
- name: Bootstrap deploy
if: ${{ matrix.dependencies == 'deploy' }}
run: |
poetry run bootstrap --ci --deploy E2E=yes
- name: Update pip and coveralls
run: |
poetry run pip install --upgrade pip
poetry run pip install --upgrade coveralls
- name: Run Test
run: poetry run run-tests

# - name: Upload Coverage ${{ matrix.tests }}
# if: ${{ matrix.dependencies == 'locked' }}
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# COVERALLS_FLAG_NAME: test
# COVERALLS_PARALLEL: true
# run: poetry run coveralls
#
# - name: Finished Coverage ${{ matrix.tests }}
# if: ${{ matrix.dependencies == 'locked' }}
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# COVERALLS_PARALLEL_FINISHED: true
# run: |
# poetry run coveralls --finish
92 changes: 0 additions & 92 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ 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 poetry
RUN pip install --upgrade setuptools wheel pip "poetry<1.1.0"

# # uwsgi uwsgitop uwsgi-tools

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Start the a background worker:

.. code-block:: console
$ celery worker -A invenio_app.celery -l INFO
$ celery -A invenio_app.celery worker -l INFO
Start a Python shell:

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ services:
file: docker-services.yml
service: app
restart: "always"
command: "poetry run celery worker -A rero_ebooks.celery --loglevel=INFO"
command: "poetry run celery -A rero_ebooks.celery worker --loglevel=INFO"
image: rero-ebooks-worker
links:
- cache
Expand All @@ -92,7 +92,7 @@ services:
file: docker-services.yml
service: app
restart: "always"
command: "poetry run celery beat -A rero_ebooks.celery --loglevel=INFO"
command: "poetry run celery -A rero_ebooks.celery beat --loglevel=INFO"
image: rero-ebooks-beat
links:
- cache
Expand Down
6 changes: 3 additions & 3 deletions docker-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ services:
- "15672:15672"
- "5672:5672"
es:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.6.2
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3
restart: "always"
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
Expand All @@ -95,13 +95,13 @@ services:
- "9200:9200"
- "9300:9300"
kibana:
image: docker.elastic.co/elasticsearch/kibana-oss:7.6.2
image: docker.elastic.co/elasticsearch/kibana-oss:7.9.3
environment:
- "ELASTICSEARCH_URL=http://es:9200"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ports: ['5601:5601']
flower:
image: mher/flower
image: mher/flower:0.9.4
command: --broker=amqp://guest:guest@mq:5672/ --broker_api=http://guest:guest@mq:15672/api/
ports:
- "5555:5555"
1 change: 1 addition & 0 deletions docker/uwsgi/uwsgi_rest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ processes = 2
threads = 2
mount = /api=invenio_app.wsgi_rest:application
manage-script-name = true
single-interpreter = true
1 change: 1 addition & 0 deletions docker/uwsgi/uwsgi_ui.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ master = true
die-on-term = true
processes = 2
threads = 2
single-interpreter = true
Loading

0 comments on commit 40aa1ca

Please sign in to comment.