Skip to content

Commit

Permalink
dependencies: update the dependencies lock file
Browse files Browse the repository at this point in the history
* New recommand python version is python 3.9.
* Uses python 3.9 for github actions and docker build.
* Updates Elastic Search to version 7.10.2.
* Corrects end dates for notification tests.
* Corrects dates for operation logs tests.

Co-Authored-by: Peter Weber <peter.weber@rero.ch>
  • Loading branch information
rerowep committed Jan 6, 2022
1 parent 9a29af2 commit 3f0f8f8
Show file tree
Hide file tree
Showing 15 changed files with 305 additions and 426 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ jobs:
- uses: actions/checkout@v2

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

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

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

- name: Install Poetry
uses: snok/install-poetry@v1.1.1
uses: snok/install-poetry@v1
with:
version: 1.0.10

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

FROM python:3.6-slim-stretch
FROM python:3.9-slim-buster

# require debian packages
RUN apt-get update -y && apt-get upgrade -y
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ among other things.

.. code-block:: console
$ pyenv install 3.6.9
$ pyenv install 3.9.7
$ cd rero-ils
$ pyenv local 3.6.9
$ pyenv local 3.9.7
$ sudo pip install poetry
Next, ``cd`` into the project directory and bootstrap the instance (this will install
Expand Down
4 changes: 2 additions & 2 deletions docker-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ services:
- "5672:5672"
es:
build: ./docker/elasticsearch/
image: elasticsearch-icu-7.10.1
image: elasticsearch-icu-7.10.2
restart: "unless-stopped"
environment:
- bootstrap.memory_lock=true
Expand All @@ -90,7 +90,7 @@ services:
- "9200:9200"
- "9300:9300"
kibana:
image: docker.elastic.co/kibana/kibana-oss:7.10.1
image: docker.elastic.co/kibana/kibana-oss:7.10.2
environment:
- "ELASTICSEARCH_URL=http://es:9200"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
Expand Down
2 changes: 1 addition & 1 deletion docker/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.1
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
RUN bin/elasticsearch-plugin install analysis-icu
Loading

0 comments on commit 3f0f8f8

Please sign in to comment.