diff --git a/docs/development/dev_setup/aa-dev-setup-wsl-vsc-v2.md b/docs/development/dev_setup/aa-dev-setup-wsl-vsc-v2.md index efb6ca31..4a74d90c 100644 --- a/docs/development/dev_setup/aa-dev-setup-wsl-vsc-v2.md +++ b/docs/development/dev_setup/aa-dev-setup-wsl-vsc-v2.md @@ -16,8 +16,8 @@ In addition all tools described in this guide are open source or free software. The development environment consists of the following components: - Visual Studio Code with Remote WSL and Python extension -- WSL with Ubunutu 18.04. LTS -- Python 3.6 environment on WSL +- WSL with Ubuntu 18.04. LTS +- Python 3.7 environment on WSL - MySQL server on WSL - Redis on WSL - Alliance Auth on WSL @@ -71,7 +71,7 @@ sudo apt-get install gettext ### Install Python -For AA we want to develop with Python 3.6, because that provides the maximum compatibility with today's AA installations. This also happens to be the default Python 3 version for Ubuntu 18.04. at the point of this writing. +For AA we want to develop with Python 3.7, because that provides the maximum compatibility with today's AA installations. ```eval_rst .. hint:: @@ -80,7 +80,7 @@ For AA we want to develop with Python 3.6, because that provides the maximum com ```eval_rst .. note:: - Should your Ubuntu come with a newer version of Python we recommend to still setup your dev environment with the oldest Python 3 version supported by AA, e.g Python 3.6 + Should your Ubuntu come with a newer version of Python we recommend to still setup your dev environment with the oldest Python 3 version supported by AA, e.g Python 3.7 You an check out this `page `_ on how to install additional Python versions on Ubuntu. ``` diff --git a/docs/installation/allianceauth.md b/docs/installation/allianceauth.md index e6de6777..0bb4bd29 100644 --- a/docs/installation/allianceauth.md +++ b/docs/installation/allianceauth.md @@ -18,28 +18,57 @@ This document describes how to install **Alliance Auth** from scratch. Alliance Auth can be installed on any Unix like operating system. Dependencies are provided below for two of the most popular Linux platforms: Ubuntu and CentOS. To install on your favorite flavour of Linux, identify and install equivalent packages to the ones listed here. -```eval_rst -.. hint:: - CentOS: A few packages are included in a non-default repository. Add it and update the package lists. :: - - yum -y install https://centos7.iuscommunity.org/ius-release.rpm - yum update -``` - ### Python -Alliance Auth requires Python 3.6 or higher. Ensure it is installed on your server before proceeding. +Alliance Auth requires Python 3.7 or higher. Ensure it is installed on your server before proceeding. -Ubuntu: +Ubuntu 1604 1804: -```bash -apt-get install python3 python3-dev python3-venv python3-setuptools python3-pip +```eval_rst +.. note:: + Ubuntu 2004 ships with Python 3.8, No updates required. ``` -CentOS: +```bash +add-apt-repository ppa:deadsnakes/ppa +``` ```bash -yum install python36u python36u-devel python36u-setuptools python36u-pip +apt-get update +``` + +```bash +apt-get install python3.7 python3.7-dev python3.7-venv +``` + +CentOS 7/8: + +```bash +cd ~ +``` + +```bash +sudo yum install gcc openssl-devel bzip2-devel libffi-devel wget +``` + +```bash +wget https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tgz +``` + +```bash +tar xvf Python-3.7.11.tgz +``` + +```bash +cd Python-3.7.11/ +``` + +```bash +./configure --enable-optimizations --enable-shared +``` + +```bash +make altinstall ``` ### Database @@ -155,7 +184,7 @@ python3 -m venv /home/allianceserver/venv/auth/ ```eval_rst .. warning:: - The python3 command may not be available on all installations. Try a specific version such as ``python3.6`` if this is the case. + The python3 command may not be available on all installations. Try a specific version such as ``python3.7`` if this is the case. ``` ```eval_rst diff --git a/docs/installation/upgrade_python.md b/docs/installation/upgrade_python.md index 684964ad..c77b40dd 100644 --- a/docs/installation/upgrade_python.md +++ b/docs/installation/upgrade_python.md @@ -53,15 +53,15 @@ sudo yum install gcc openssl-devel bzip2-devel libffi-devel wget ``` ```bash -wget https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tgz +wget https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tgz ``` ```bash -tar xvf Python-3.7.10.tgz +tar xvf Python-3.7.11.tgz ``` ```bash -cd Python-3.7.10/ +cd Python-3.7.11/ ``` ```bash @@ -182,7 +182,7 @@ mv /home/allianceserver/venv/auth /home/allianceserver/venv/auth_old ## Create your new venv -Now let's create our new venv with Python 3.6 and activate it: +Now let's create our new venv with Python 3.7 and activate it: ```bash python3.7 -m venv /home/allianceserver/venv/auth