diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41aff22610c4c64fd53f29c3ee59a155c68a7c73..a7c41c9fc029994b82ed66f9235bea292404aa3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: python:3.7 +image: python:3.8 stages: - test @@ -9,13 +9,6 @@ before_script: - apt-get install -y python3-virtualenv virtualenv opam libev4 libev-dev libsndfile1 quelcom # mariadb-server libmariadbclient-dev - /usr/bin/virtualenv venv - . venv/bin/activate - # - opam init --disable-sandboxing -y - # - opam switch create 4.08.0 - # - opam update -y - # - opam install depext -y - # - opam depext taglib mad lame vorbis flac opus cry samplerate pulseaudio bjack alsa ssl liquidsoap -y - # - opam install taglib mad lame vorbis flac opus cry samplerate pulseaudio bjack alsa ssl liquidsoap -y - # - eval $(opam env) - python3 -V - pip3 install -r requirements.txt - mkdir /etc/aura diff --git a/docs/installation-development.md b/docs/installation-development.md index fa5e686e40776769a3bf1a1c5e4222198bf32894..2232082875cfa08f241d11a2e012bfbbd22a115c 100644 --- a/docs/installation-development.md +++ b/docs/installation-development.md @@ -17,7 +17,7 @@ Aura Engine runs on any modern Debian-based OS. It requires at least -- `Python 3.7` or `Python 3.8` +- `Python 3.8+` - `git` Additionally you'll need these system packages: diff --git a/docs/installation-production.md b/docs/installation-production.md index 586cf74524f952b6b6601740cf077964e829acdc..06da73dc6339475c3e416f0bf466f070df952ed7 100644 --- a/docs/installation-production.md +++ b/docs/installation-production.md @@ -20,7 +20,7 @@ Aura Engine runs on any modern Debian-based OS. It requires at least -- `Python 3.7` or `Python 3.8` +- `Python 3.8+` - `git` Additionally you'll need these system packages below. diff --git a/install.sh b/install.sh index 6df3f6b5b583e1061496908a16f9ef61145d01fe..ca6a117202b1e5cb1ed6ffb0e13c2bf33375d564 100755 --- a/install.sh +++ b/install.sh @@ -15,12 +15,12 @@ fi # Find the correct Python version (3.7 or 3.8) -if hash python3.8 2>/dev/null; then +if hash python3.9 2>/dev/null; then + PYTHON_EXEC="python3.9" + echo "[ Using Python 3.9 ]" +else PYTHON_EXEC="python3.8" echo "[ Using Python 3.8 ]" -else - PYTHON_EXEC="python3.7" - echo "[ Using Python 3.7 ]" fi # Development and Production diff --git a/run.py b/run.py index 717adc2bf98450cbd9d26f4133004eeffe54292f..e9842d6647280ac6073003564a2d91344dc162eb 100755 --- a/run.py +++ b/run.py @@ -1,6 +1,6 @@ #!/bin/sh -''''which python3.8 >/dev/null 2>&1 && exec python3.8 "$0" "$@" # ''' -''''which python3.7 >/dev/null 2>&1 && exec python3.7 "$0" "$@" # ''' +''''which python3.9 >/dev/null 2>&1 && exec python3.9 "$0" "$@" # ''' +''''which python3.8 >/dev/null 2>&1 && exec python3.8 "$0" "$@" # ''' ''''exec echo "Error: Snaaakey Python, where are you?" # ''' # diff --git a/run.sh b/run.sh index b5103763cf0a55ba690c7b9de62aed31006bac6a..2ea17f19913d5e2a885d16e28c10bf6f285dd030 100755 --- a/run.sh +++ b/run.sh @@ -32,14 +32,14 @@ echo "[ Run mode=$mode ]" echo "[ Docker=$docker ]" -# Find the correct Python version (3.7 or 3.8) +# Find the correct Python version (3.8 or 3.9) -if hash python3.8 2>/dev/null; then +if hash python3.9 2>/dev/null; then + PYTHON_EXEC="python3.9" + echo "[ Using Python 3.9 ]" +else PYTHON_EXEC="python3.8" echo "[ Using Python 3.8 ]" -else - PYTHON_EXEC="python3.7" - echo "[ Using Python 3.7 ]" fi