diff --git a/REQUIREMENTS-dev.txt b/REQUIREMENTS-dev.txt index 8e4d5297..0fe766c2 100644 --- a/REQUIREMENTS-dev.txt +++ b/REQUIREMENTS-dev.txt @@ -1,3 +1,3 @@ flake8 pre-commit -freezegun +freezegun \ No newline at end of file diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt deleted file mode 100644 index c8375f10..00000000 --- a/REQUIREMENTS.txt +++ /dev/null @@ -1,71 +0,0 @@ -Django==3.2.11 - -# Currently broken with 'no module named defaults' error -#Feedjack==0.9.18 -# So use George's fork rather -# git+https://github.com/Erve1879/feedjack.git -# George's is also broken: use elpaso fork (django 1.8 ready) -# git+https://github.com/elpaso/feedjack.git -# His is also broken, use dimasciput (django 3.2 ready) -git+https://github.com/dimasciput/feedjack.git - -Markdown==2.3.1 -#PIL==1.1.7 -Pillow -Pygments==2.7.4 - -# Updates for Django 2 & Python 3.7 -git+https://github.com/Xpirix/whoosh.git@main -pickle5==0.0.12 -django-haystack==3.2.1 - -argparse==1.2.1 -#cab==0.2.0 # Not used anymore..- -#distribute==0.7.3 -django-annoying==0.7.7 -django-auth-ldap==1.2.6 -django-autoslug==1.7.1 -django-debug-toolbar==3.2.4 -django-endless-pagination==2.0 -django-extensions==1.2.0 -django-generic-aggregation==0.3.2 -#django-olwidget==0.61.0 unmaintained, use this fork -git+https://github.com/Christophe31/olwidget.git -django-pagination==1.0.7 - -# Unmaintained! -#django-ratings==0.3.7 -git+https://github.com/gelo-zhukov/django-ratings.git - -django-simple-ratings==0.3.2 -# SIMPLEMENU -git+https://github.com/elpaso/django-simplemenu.git -django-taggit==2.0.0 -django-taggit-autosuggest==0.2.7 -django-taggit-templatetags==0.4.6dev0 -django-templatetag-sugar==0.1 -django-tinymce==3.4.0 -feedparser==5.1.3 -lxml==4.6.5 -opml==0.5 -psycopg2==2.5.1 -python-ldap==2.4.19 -# RPC4DJANGO -git+https://github.com/davidfischer/rpc4django.git -six==1.4.1 -sorl-thumbnail==12.7.0 -sorl-thumbnail-serializer-field==0.2.1 -sqlparse==0.1.11 -wsgiref==0.1.2 -simplejson==3.3.3 -BeautifulSoup -django-bootstrap-pagination==1.7.1 -django-sortable-listview==0.43 -django-user-map -djangorestframework==3.12.2 -pyjwt==1.7.1 -djangorestframework-simplejwt==4.4 -django-rest-auth==0.9.5 -drf-yasg -geoip2==4.5.0 -django-matomo==0.1.6 diff --git a/dockerize/docker/REQUIREMENTS.txt b/dockerize/docker/REQUIREMENTS.txt index 24146e93..e3827683 100644 --- a/dockerize/docker/REQUIREMENTS.txt +++ b/dockerize/docker/REQUIREMENTS.txt @@ -2,7 +2,7 @@ django~=4.2 django-auth-ldap~=4.6 python-ldap~=3.4 django-taggit~=5.0 -django-tinymce==3.4.0 +django-tinymce==4.1.0 psycopg2-binary~=2.9 # Updates for Django 2 git+https://github.com/metamatik/django-templatetag-sugar.git diff --git a/qgis-app/REQUIREMENTS_plugins.txt b/qgis-app/REQUIREMENTS_plugins.txt index ebb39373..be3c802d 100644 --- a/qgis-app/REQUIREMENTS_plugins.txt +++ b/qgis-app/REQUIREMENTS_plugins.txt @@ -1,30 +1,64 @@ -django==3.2.11 -django-auth-ldap -python-ldap -django-taggit==2.0.0 -django-tinymce==3.4.0 -psycopg2 +django~=4.2 +django-auth-ldap~=4.6 +python-ldap~=3.4 +django-taggit~=5.0 +django-tinymce==4.1.0 +psycopg2-binary~=2.9 # Updates for Django 2 git+https://github.com/metamatik/django-templatetag-sugar.git +# Updates for Django 4 +git+https://github.com/Xpirix/django-ratings.git@modernize +django-taggit-autosuggest~=0.4 +django-annoying~=0.10 -# Updates for Django 3 -git+https://github.com/gelo-zhukov/django-ratings.git - -django-taggit-autosuggest -django-annoying # Updates for Django 2 -git+https://github.com/elpaso/rpc4django.git@modernize -Pillow +# git+https://github.com/elpaso/rpc4django.git@modernize +rpc4django~=0.6 +Pillow~=10.1 django-taggit-templatetags -# Updates for Django 2 -git+https://github.com/elpaso/django-simplemenu.git@modernize -django-bootstrap-pagination -django-sortable-listview -sorl-thumbnail -django-extensions -django-debug-toolbar==3.2.4 - -# Updates for Django 2 & Python 3.7 -git+https://github.com/Xpirix/whoosh.git@main -pickle5==0.0.12 -django-haystack==3.2.1 +# Updates for Django 4 +git+https://github.com/Xpirix/django-simplemenu.git@modernize +django-bootstrap-pagination-forked~=1.7 +django-sortable-listview~=0.43 +sorl-thumbnail~=12.10 +django-extensions~=3.2 +django-debug-toolbar~=4.2 +whoosh~=2.7 +django-haystack~=3.2 + +# Feedjack==0.9.18 +# So use George's fork rather +# git+https://github.com/Erve1879/feedjack.git +# George's is also broken: use my fork (django 1.8 ready) +# git+https://github.com/elpaso/feedjack.git +# His is also broken, use dimasciput (django 2.2 ready) +# git+https://github.com/dimasciput/feedjack.git +# For django 4, use Xpirix (django 4.2 ready) +git+https://github.com/Xpirix/feedjack.git +feedparser~=6.0 +celery~=5.3 + +# pin due to issues with a breaking change +# https://github.com/celery/celery/issues/7783 +importlib_metadata<5 + +requests~=2.31 + +markdown~=3.5 + +djangorestframework~=3.14 +pyjwt~=2.8 +djangorestframework-simplejwt~=5.3 +sorl-thumbnail-serializer-field==0.2.1 +django-rest-auth==0.9.5 +drf-yasg~=1.21 +django-rest-multiple-models==2.1.3 + +django-preferences==1.0.0 +PyWavefront==1.3.3 +geoip2==4.5.0 +django-matomo==0.1.6 +uwsgi~=2.0 +freezegun~=1.4 + +sentry-sdk~=2.2 \ No newline at end of file