Up to 1.6.11 on stretch. New manage.py. Some tidying

core/forms.py

@@ -62,7 +62,7 @@ class EntranceForm(ModelForm):
 
 
 
-CaveAndEntranceFormSet = modelformset_factory(CaveAndEntrance, exclude=('cave'))
+CaveAndEntranceFormSet = modelformset_factory(CaveAndEntrance, exclude=('cave',))
 
 class EntranceLetterForm(ModelForm):
     class Meta:

docker/Dockerfile

@@ -1,6 +1,10 @@
-FROM python:2.7-jessie
+FROM python:2.7-stretch
 
-RUN apt-get -y update && apt-get install -y mercurial fonts-freefont-ttf survex locales
+#COPY backports.list /etc/apt/sources.list.d/
+
+RUN apt-get -y update && apt-get install -y mercurial fonts-freefont-ttf locales survex
+
+#RUN apt-get -y -t -backports install survex
 
 # Set the locale
 RUN locale-gen en_GB.UTF-8
@@ -11,8 +15,12 @@ ENV LC_ALL en_GB.UTF-8
 WORKDIR /opt/expo/troggle
 COPY requirements.txt .
 
+RUN pip install --upgrade pip
+
 RUN pip install -r requirements.txt
 
 EXPOSE 8000
 
+WORKDIR /expo/troggle
+
 #CMD ["python","manage.py","runserver","0.0.0.0:8000"]

docker/Dockerfile-django-1.5.12-jessie

@@ -0,0 +1,26 @@
+FROM python:2.7-jessie
+
+COPY backports.list /etc/apt/sources.list.d/
+
+RUN apt-get -y update && apt-get install -y mercurial fonts-freefont-ttf locales
+
+RUN apt-get -y -t jessie-backports install survex
+
+# Set the locale
+RUN locale-gen en_GB.UTF-8
+ENV LANG en_GB.UTF-8  
+ENV LANGUAGE en_GB:en  
+ENV LC_ALL en_GB.UTF-8 
+
+WORKDIR /opt/expo/troggle
+COPY requirements.txt .
+
+RUN pip install --upgrade pip
+
+RUN pip install -r requirements.txt
+
+EXPOSE 8000
+
+WORKDIR /expo/troggle
+
+#CMD ["python","manage.py","runserver","0.0.0.0:8000"]

docker/backports.list

@@ -0,0 +1 @@
+deb http://ftp.debian.org/debian jessie-backports main

docker/requirements.txt

@@ -1,4 +1,4 @@
-Django==1.5.12
+Django==1.6.11
 django-registration==1.0
 mysql
 imagekit

docker/requirements.txt.dj-1.5.12

@@ -0,0 +1,7 @@
+Django==1.5.12
+django-registration==1.0
+mysql
+imagekit
+Image
+django-tinymce==1.5.3
+smartencoding

manage.py

@@ -1,11 +1,8 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os, sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    from django.core.management import execute_from_command_line
+    execute_from_command_line(sys.argv)
+

parsers/surveys.py

@@ -138,7 +138,7 @@ def parseSurveyScans(expedition, logfile=None):
 
 # dead
 def parseSurveys(logfile=None):
-    readSurveysFromCSV()                
+    readSurveysFromCSV()
     for expedition in Expedition.objects.filter(year__gte=2000):   #expos since 2000, because paths and filenames were nonstandard before then
         parseSurveyScans(expedition)
 
@@ -298,7 +298,3 @@ def LoadTunnelFiles():
                 
     for tunnelfile in TunnelFile.objects.all():
         SetTunnelfileInfo(tunnelfile)
-    
-        
-
-