Migration to Python3

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.travis_job }}
+    name: ${{ matrix.travis_job }} (Python ${{ matrix.python-version }})
     runs-on: ubuntu-20.04
     services:
       postgres:
@@ -23,8 +23,9 @@ jobs:
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['pypy2.7']
+        python-version: [3.7]
         travis_job: ["lint", "test"]
     env:
       DJANGO_SETTINGS_MODULE: esp.settings
@@ -38,17 +39,22 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Prepare for Installing Dependencies
       run: deploy/travis/before_install
+      env:
+        PYTHON_VERSION: ${{ matrix.python-version }}
     - name: Install Dependencies for ${{ matrix.travis_job }}
       env:
         TRAVIS_JOB: ${{ matrix.travis_job }}
+        PYTHON_VERSION: ${{ matrix.python-version }}
       run: deploy/travis/install
     - name: Prepare for ${{ matrix.travis_job }}
       env:
         TRAVIS_JOB: ${{ matrix.travis_job }}
+        PYTHON_VERSION: ${{ matrix.python-version }}
       run: deploy/travis/before_script
     - name: Run ${{ matrix.travis_job }}
       env:
         TRAVIS_JOB: ${{ matrix.travis_job }}
+        PYTHON_VERSION: ${{ matrix.python-version }}
       run: deploy/travis/script
     - name: Upload Coverage to Codecov
       if: ${{ matrix.travis_job == 'test' }}

Vagrantfile

@@ -6,12 +6,13 @@ VAGRANTFILE_API_VERSION = '2'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  # Build off the basic Ubuntu 20.04 64-bit VM.
-  config.vm.box = 'ubuntu-20.04'
-  config.vm.box_url = 'https://s3.amazonaws.com/learningu-static/ubuntu-20.04.box'
+  # Build off the basic Ubuntu 64-bit VM.
+  config.vm.box = 'ubuntu-24.04'
+  config.vm.box_url = 'https://learningu-static.s3.amazonaws.com/ubuntu-24.04.box'
   config.vm.hostname = 'ludev'
   config.ssh.forward_agent = true
   config.ssh.forward_x11 = true
+  config.ssh.insert_key = false
 
   # Forward port for Django dev server
   config.vm.network :forwarded_port, guest: 8000, host: 8000
@@ -28,6 +29,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider :virtualbox do |vb|
     # vb.gui = true
     vb.customize ['modifyvm', :id, '--memory', '2048']
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
   end
 
 end

deploy/config_templates/local_settings.py

@@ -1,5 +1,6 @@
 """ Local system-specific settings. """
 
+from __future__ import absolute_import
 import os
 
 SITE_INFO = (1, 'devsite.learningu.org', 'LU Dev Site')

deploy/travis/before_install

@@ -1,19 +1,9 @@
 #!/bin/bash
 set -euf -o pipefail
 
-if [ $(echo "$(lsb_release -rs) > 20" | bc) -eq 1 ]; then 
-  sudo apt update
- else
-  sudo apt-get update
-fi
+sudo add-apt-repository ppa:deadsnakes/ppa
+
+sudo apt update
 
 # install pip
-sudo add-apt-repository universe
-if [ $(echo "$(lsb_release -rs) > 20" | bc) -eq 1 ]; then 
-  sudo apt install -y curl
- else
-  sudo apt-get install -y curl
-fi
-curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
-sudo python2 get-pip.py
-sudo python2 -m pip install --upgrade pip==20.1
+sudo apt -y install python3-pip

deploy/travis/before_script

@@ -3,10 +3,13 @@ set -euf -o pipefail
 
 if [ "$TRAVIS_JOB" = "test" ]; then
     cp esp/esp/local_settings.py.travis esp/esp/local_settings.py
-    ln -s `pwd`/esp/public/media/default_images esp/public/media/images
-    ln -s `pwd`/esp/public/media/default_styles esp/public/media/styles
+    ln -f -s `pwd`/esp/public/media/default_images esp/public/media/images
+    ln -f -s `pwd`/esp/public/media/default_styles esp/public/media/styles
     # the postgres service in Github Actions sets up the database for us
     if [ "$GITHUB_ACTIONS" != true ]; then
+        psql -c "DROP DATABASE IF EXISTS test_test_django;" -U postgres
+        psql -c "DROP DATABASE IF EXISTS test_django;" -U postgres
+        psql -c "DROP ROLE IF EXISTS testuser;" -U postgres
         psql -c "CREATE ROLE testuser PASSWORD 'testpassword' LOGIN CREATEDB;" -U postgres
         psql -c "CREATE DATABASE test_django OWNER testuser;" -U postgres
     fi

deploy/travis/install

@@ -5,10 +5,10 @@ if [ "$TRAVIS_JOB" = "test" ]; then
     sudo apt-get remove -y libhashkit2
     sudo apt-get install -y $(cat esp/packages_base.txt | grep -v ^memcached | grep -v ^postgres | grep -v ^libpq-dev | grep -v ^.*pip)
     esp/packages_base_manual_install.sh
-    pip2 install -r esp/requirements.txt -q --log pip.log || (tail pip.log && exit 1)
-    pip2 install coverage
+    pip3 install -r esp/requirements.txt -q --log pip.log || (tail pip.log && exit 1)
+    pip3 install coverage
 elif [ "$TRAVIS_JOB" = "lint" ]; then
-    pip2 install flake8
+    pip3 install flake8
 else
     echo "Unknown TRAVIS_JOB: $TRAVIS_JOB"
     exit 1

docs/dev/deploying.rst

@@ -11,8 +11,7 @@ To deploy a new site, first make sure you know:
 #. the group's name (e.g. "MIT ESP" or "Yale Splash")
 #. the chapter's preferred `theme <../admin/available_themes.rst>`_
 
-Then ssh to ``diogenes``, grab the latest version of
-``deploy/server_setup/new_site.sh``, ``cd`` to ``/lu/sites``, and
+Then ssh to the production server, ``cd`` to ``/lu/sites``, and
 run ``sudo new_site.sh --all``.  If the directory already exists for the
 chapter, you may wish to delete it to get a clean start.  (You may instead
 clone the repository yourself, ``cd`` into it, and run the script from there.)

docs/dev/email.rst

@@ -1,7 +1,7 @@
 ESP Email Setup
 ===============
 
-This document describes how email, both incoming and outgoing, makes its way where it's going on the ESP website.  The code will serve as a more specific reference for the details, but this is an overview of the high-level setup.  Note: this document describes the setup on diogenes; the parts of the setup outside the ESP-Website codebase may vary slightly on sites hosted elsewhere (i.e. esp.mit.edu).
+This document describes how email, both incoming and outgoing, makes its way where it's going on the ESP website.  The code will serve as a more specific reference for the details, but this is an overview of the high-level setup.  Note: this document describes the setup on the LU production server; the parts of the setup outside the ESP-Website codebase may vary slightly on sites hosted elsewhere (in particular, esp.mit.edu).
 
 .. contents:: :local: