Merge branch 'release/3.1.46'

azavea · May 6, 2024 · a2bdbc8 · a2bdbc8
2 parents 419fd04 + 29433ca
commit a2bdbc8
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 16 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,2 +1,4 @@
 [defaults]
 ALLOW_WORLD_READABLE_TMPFILES = True
+stdout_callback=debug
+stderr_callback=debug
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -29,8 +29,8 @@ papertrail_log_files:
     - "/var/log/event-feed.log"
     - "/var/log/upstart/otp.log"
 
-postgresql_version: "9.6"
-postgresql_package_version: "9.6.*"
+postgresql_version: "12"
+postgresql_package_version: "12.*.pgdg20.04+1"
 postgresql_support_libpq_version: "*"
 
 postgresql_listen_addresses: "*"

diff --git a/deployment/ansible/roles/cac-tripplanner.database/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.database/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # postgresql defaults copied from azavea.postgresql
-postgresql_version: "9.6"
-postgresql_package_version: "9.6.*"
+postgresql_version: "12"
+postgresql_package_version: "12.*.*"
 postgresql_listen_addresses: localhost
 postgresql_port: 5432
 postgresql_data_directory: /var/lib/postgresql/{{ postgresql_version }}/main

diff --git a/deployment/packer/cac_packer.py b/deployment/packer/cac_packer.py
@@ -21,7 +21,7 @@ def get_ubuntu_ami(region):
       creds (Dict): Dictionary containing AWS credentials
     """
 
-    response = urllib.urlopen('http://cloud-images.ubuntu.com/query/bionic/'
+    response = urllib.urlopen('http://cloud-images.ubuntu.com/query/jammy/'
                               'server/released.current.txt').readlines()
     response = [x.decode('utf-8') for x in response]
     fieldnames = ['version', 'version_type', 'release_status', 'date',

diff --git a/python/cac_tripplanner/cac_tripplanner/settings.py b/python/cac_tripplanner/cac_tripplanner/settings.py
@@ -165,8 +165,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 # Directory for default featured destinations added in destinations 0012
@@ -189,7 +187,9 @@
 
 STATIC_URL = "/static/"
 STATIC_ROOT = "/srv/cac"
-STATICFILES_DIRS = ()
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, 'static/'),
+]
 
 MEDIA_ROOT = "/media/cac/"
 MEDIA_URL = "/media/"
@@ -314,6 +314,7 @@
             "top": "wpadmin.menu.menus.BasicTopMenu",
             "left": "wpadmin.menu.menus.BasicLeftMenu",
         },
+        'custom_style': STATIC_URL + 'admin/css/pagination.css',
     }
 }
 

diff --git a/python/cac_tripplanner/cac_tripplanner/urls.py b/python/cac_tripplanner/cac_tripplanner/urls.py
@@ -1,5 +1,4 @@
-from django.conf.urls import re_path
-from django.urls import include
+from django.urls import include, re_path
 from django.views.generic import RedirectView
 from django.contrib.gis import admin
 

diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,12 +1,12 @@
 base58==2.0.1
 boto3==1.15.9
 boto==2.49.0
-Django==3.2.13
+Django==4.2.11
 django-ckeditor==6.0.0
-django-image-cropping==1.5.0
+django-image-cropping==1.7.0
 django-extensions==3.1.5
 django-storages==1.10.1
-easy-thumbnails==2.8.1
+easy-thumbnails==2.8.5
 gunicorn==20.0.4
 lxml==4.9.2
 Pillow==7.2.0

diff --git a/python/cac_tripplanner/shortlinks/test/urls.py b/python/cac_tripplanner/shortlinks/test/urls.py
@@ -1,5 +1,4 @@
-from django.conf.urls import re_path
-from django.urls import include, path
+from django.urls import include, path, re_path
 from shortlinks.test.views import stub_view
 
 app_name = 'shortlinks'

diff --git a/python/cac_tripplanner/shortlinks/urls.py b/python/cac_tripplanner/shortlinks/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import re_path
+from django.urls import re_path
 from django.views.decorators.csrf import csrf_exempt
 
 from .views import ShortenedLinkRedirectView, ShortenedLinkCreateView

diff --git a/python/cac_tripplanner/static/admin/css/pagination.css b/python/cac_tripplanner/static/admin/css/pagination.css
@@ -0,0 +1,3 @@
+#change-history > p.paginator {
+    width: auto;
+}
diff --git a/python/cac_tripplanner/templates/admin/base.html b/python/cac_tripplanner/templates/admin/base.html
@@ -1,4 +1,19 @@
 {% extends "admin/base.html" %}
+{% load i18n %}
+{% block breadcrumbs %}
+  {% if title != 'Site administration' %}
+    <div class="breadcrumbs">
+      <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+      {% if title %}
+          {% if title|slice:'-14:' == 'administration' %}
+              &rsaquo; {{ title|slice:':-14' }}
+          {% else %}
+              &rsaquo; {{ title }}
+          {% endif %}
+      {% endif %}
+    </div>
+  {% endif %}
+{% endblock %}
 {% load cropping thumbnail %}
 {% block extrahead %}
   {{ form.media }}