Test dependabot for Dockerfiles & Bump Postgres to 11 (#557)

* Test dependabot for Dockerfiles.

* Also for github actions

* Update dependabot.yml

* Fix urls.py for new versions of Django

* Fix urls.py for postorius.

* Bump dependency on Postgresql.

* Bump dependency on Django

* Add dependency on tzdata.
This commit is contained in:
Abhilash Raj
2022-10-25 23:25:57 -07:00
committed by GitHub
parent 2693386453
commit 208017f9a0
5 changed files with 38 additions and 21 deletions

View File

@@ -33,10 +33,11 @@ RUN --mount=type=cache,target=/root/.cache \
mysqlclient \
xapian-haystack \
django-auth-ldap \
python-memcached \
python-memcached \
tzdata \
diskcache \
django-utils-six \
&& python3 -m pip install -U 'Django<3.2' \
&& python3 -m pip install -U 'Django<4.3' \
&& python3 -m pip install -U \
git+https://gitlab.com/mailman/django-mailman3 \
&& apk del .build-deps \

View File

@@ -16,20 +16,19 @@
# You should have received a copy of the GNU General Public License along with
# Postorius. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import include, url
from django.conf.urls import include
from django.contrib import admin
from django.urls import reverse_lazy
from django.urls import path, reverse_lazy
from django.views.generic import RedirectView
urlpatterns = [
url(r'^$', RedirectView.as_view(
path(r'^$', RedirectView.as_view(
url=reverse_lazy('list_index'),
permanent=True)),
url(r'^postorius/', include('postorius.urls')),
url(r'^hyperkitty/', include('hyperkitty.urls')),
url(r'', include('django_mailman3.urls')),
url(r'^accounts/', include('allauth.urls')),
path(r'postorius/', include('postorius.urls')),
path(r'hyperkitty/', include('hyperkitty.urls')),
path(r'', include('django_mailman3.urls')),
path(r'accounts/', include('allauth.urls')),
# Django admin
url(r'^admin/', admin.site.urls),
path(r'^admin/', admin.site.urls),
]