Skip to content
Snippets Groups Projects
Commit 26cc3f0f authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'fix-pipeline' into 'main'

Fix CI pipeline and remove version pinning in setup script

See merge request !113
parents 253c5cd3 fdaa9f0e
No related branches found
No related tags found
No related merge requests found
image: python:3.7 image: python:3.9
services: services:
- mysql:5.7 - mysql:5.7
...@@ -17,7 +17,7 @@ cache: ...@@ -17,7 +17,7 @@ cache:
before_script: before_script:
- python -V # Print out python version for debugging - python -V # Print out python version for debugging
- apt-get -qq update - apt-get -qq update
- apt-get -qq install -y python-virtualenv python3 python3-dev python3-pip gettext default-libmysqlclient-dev - apt-get -qq install -y python3-virtualenv python3 python3-dev python3-pip gettext default-libmysqlclient-dev
- export DJANGO_SETTINGS_MODULE=AKPlanning.settings_ci - export DJANGO_SETTINGS_MODULE=AKPlanning.settings_ci
- ./Utils/setup.sh --prod - ./Utils/setup.sh --prod
......
...@@ -10,7 +10,7 @@ rm -rf venv/ ...@@ -10,7 +10,7 @@ rm -rf venv/
# Setup Python Environment # Setup Python Environment
# Requires: Virtualenv, appropriate Python installation # Requires: Virtualenv, appropriate Python installation
virtualenv venv -p python3.7 virtualenv venv -p python3.9
source venv/bin/activate source venv/bin/activate
pip install --upgrade setuptools pip wheel pip install --upgrade setuptools pip wheel
pip install -r requirements.txt pip install -r requirements.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment