Merge pull request #155 from EarthSchlange/update_to_python3

Update the AGAGD to Python 3.7
usgo · Feb 18, 2021 · d736e05 · d736e05
2 parents 155ba06 + 09aff32
commit d736e05
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 97 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@
 # * MYSQL_PASSWORD - database password (the docker entrypoint sets MYSQL_PASS to this value for app compatibility)
 
 ### Build stage, to avoid leaving dev dependencies in the final image
-FROM python:2.7-slim AS build
+FROM python:3.7-slim-buster AS build
 
 WORKDIR /build
 
@@ -22,7 +22,7 @@ COPY requirements.txt /build/
 RUN pip install --user --no-cache-dir -r requirements.txt && pip install --user --no-cache-dir uwsgi
 
 ### Final image
-FROM python:2.7-slim
+FROM python:3.7-slim-buster
 
 WORKDIR /srv
 RUN useradd django

diff --git a/Dockerfile.python3 b/Dockerfile.python3
diff --git a/agagd/agagd_core/models.py b/agagd/agagd_core/models.py
@@ -30,7 +30,7 @@ class Member(models.Model):
     renewal_due = models.CharField(max_length=255, blank=True)
     type = models.CharField(max_length=255, blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return " %s (%s) " % (self.full_name, self.member_id, )
 
     class Meta:

diff --git a/docker-compose-python3.yml b/docker-compose-python3.yml