summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.txt1
-rw-r--r--deprecations.txt13
-rw-r--r--manage.py4
-rw-r--r--requirements.txt4
-rw-r--r--urls.py4
5 files changed, 6 insertions, 20 deletions
diff --git a/README.txt b/README.txt
index 2befdb7..0d111b4 100644
--- a/README.txt
+++ b/README.txt
@@ -134,6 +134,7 @@ from within any folder on your machine.
Now do
$ cd troggle
$ python manage.py
+$ python manage.py check -v 3 --traceback
You should see the same list of commands that you saw with django-admin but wth
a lot of extra ones and no complaints. This means it is reading at least some of your
diff --git a/deprecations.txt b/deprecations.txt
index d4bfef2..06c148a 100644
--- a/deprecations.txt
+++ b/deprecations.txt
@@ -4,16 +4,3 @@
from collections import Counter, Iterator, Mapping, OrderedDict
/mnt/d/CUCC-Expo/t37/lib/python3.7/site-packages/django/core/paginator.py:126: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3,and in 3.9 it will stop working
class Page(collections.Sequence):
-/mnt/d/CUCC-Expo/t37/lib/python3.7/site-packages/registration/auth_urls_classes.py:20: DeprecationWarning:
-include('registration.auth_urls') is deprecated and will be
-removed in django-registration 3.0. Use
-include('django.contrib.auth.urls') instead.
-
- DeprecationWarning
-/mnt/d/CUCC-Expo/t37/lib/python3.7/site-packages/registration/backends/default/urls.py:25: DeprecationWarning:
-include('registration.backends.default.urls') is deprecated and
-will be removed in django-registration 3.0. Use
-include('registration.backends.model_activation.urls')
-instead.
-
- DeprecationWarning
diff --git a/manage.py b/manage.py
index 0970f13..37e5ee1 100644
--- a/manage.py
+++ b/manage.py
@@ -2,11 +2,11 @@
import os
import sys
"""This file is the route to run the standard Django utilities on the command line.
-These ar ethe most useful for troggle:
+These are the most useful for troggle:
python manage.py test -- runs the troggle test suite
python manage.py test -v 3 -- runs the troggle test suite with more detailed output
-python manage.py -Wall check -- runs the djang system package deprecation warnings
+python -Wall manage.py check -- runs the python package deprecation warnings
python manage.py makemigrations -- creates django db migrations files
python manage.py inspectdb -- creates datamodel documentaiton as python file
python manage.py check -v 3 --deploy -- runs the django system security warnings
diff --git a/requirements.txt b/requirements.txt
index c201be3..92e6601 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,6 @@ confusable-homoglyphs==3.2.0
Django==1.11.29
django-registration==2.5.2
docutils==0.16
-Pillow==7.1.2
+Pillow==7.2.0
pytz==2020.1
-six==1.15.0
-sqlparse==0.3.1
Unidecode==1.1.1
diff --git a/urls.py b/urls.py
index a92a0ee..cc72be2 100644
--- a/urls.py
+++ b/urls.py
@@ -26,7 +26,7 @@ which is vital to writing code for the webapp. So the URL dispatch is declarativ
The API urls return TSV or JSON and are new in July 2020.
"""
-admin.autodiscover()
+#admin.autodiscover()
# Many of these patterns do not work because troggle spent many years broken and we have
# not yet restored all the functions. Some may have never been fully implemented in
@@ -93,7 +93,7 @@ actualurlpatterns = [
url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/).
url(r'^admin/', admin.site.urls),
- url(r'^accounts/', include('registration.backends.default.urls')), # needed to log in!
+ url(r'^accounts/', include('registration.backends.default.urls')), #LOGIN_URL = '/accounts/login/' # default
# url(r'^profiles/', include('profiles.urls')), # not used ? Delete this entire app then.
# url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map