Upgrade to CKAN 2.11

.env

@@ -0,0 +1,6 @@
+CKAN_SQLALCHEMY_URL = postgresql://ckan:[email protected]/ckan_test
+CKAN_DATASTORE_WRITE_URL = postgresql://ckan:[email protected]/datastore_test
+CKAN_DATASTORE_READ_URL = postgresql://ckan:[email protected]/datastore_test
+CKAN_SOLR_URL = http://192.168.49.2:8983/solr/ckan
+CKAN_REDIS_URL = redis://192.168.49.2:6379/1
+CKAN_STORAGE_PATH = ./build/ckan_storage

.gitignore

@@ -12,4 +12,5 @@
 .ipython
 .vscode
 .pdbhistory
-*.code-workspace
+*.code-workspace
+.python_history

.gitmodules

@@ -4,9 +4,9 @@
 [submodule "ckanext-dms"]
 	path = ckanext-dms
 	url = [email protected]:fjelltopp/ckanext-dms.git
-[submodule "ckanext-emailasusername"]
-	path = ckanext-emailasusername
-	url = [email protected]:fjelltopp/ckanext-emailasusername.git
 [submodule "ckanext-short-urls"]
 	path = ckanext-short-urls
 	url = [email protected]:fjelltopp/ckanext-short-urls.git
+[submodule "ckanext-dataset-subscriptions"]
+	path = ckanext-dataset-subscriptions
+	url = [email protected]:fjelltopp/ckanext-dataset-subscriptions

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/fjelltopp/fjelltopp-base-images/ckan_base:master
+FROM ghcr.io/fjelltopp/fjelltopp-base-images/ckan_py310_base:1.0.0
 
 USER root
 RUN rm -rf /usr/lib/ckan/*

Pipfile

@@ -4,104 +4,107 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-alembic = "==1.0.0"
-bleach = "==3.1.4"
-blinker = "==1.4"
-click = "==7.1.2"
-dominate = "==2.4.0"
-feedgen = "==0.9.0"
+alembic = "==1.13.2"
+babel = "==2.15.0"
+bleach = "==6.1.0"
+blinker = "==1.8.2"
+certifi = ">=2024.7.4"
+click = "==8.1.7"
+dominate = "==2.9.1"
+feedgen = "==1.0.0"
+flask = "==3.0.3"
+flask-babel = "==4.0.0"
+flask-login = "==0.6.3"
 flask-multistatic = "==1.0"
-passlib = "==1.6.5"
-polib = "==1.0.7"
-psycopg2 = "==2.8.2"
-python-magic = "==0.4.15"
-pysolr = "==3.6.0"
-python-dateutil = ">=1.5.0"
-pytz = "==2016.7"
+flask-session = "==0.8.0"
+flask-wtf = "==1.2.1"
+idna = "==3.7"
+jinja2 = "==3.1.4"
+markdown = "==3.7.0"
+msgspec = "==0.18.6"
+packaging = "==24.1"
+passlib = "==1.7.4"
+polib = "==1.2.0"
+psycopg2 = "==2.9.9"
+pyjwt = {version = "==2.8.0",extras = ["crypto"]}
+pyparsing = "==3.1.2"
+pysolr = "==3.9.0"
+python-dateutil = "==2.9.0.post0"
+python-magic = "==0.4.27"
+pytz = "==2024.2"
+pyyaml = "==6.0.1"
+requests = "==2.32.3"
+rq = "==1.16.2"
+simplejson = "==3.19.2"
+six = "==1.16.0"
+sqlalchemy = {version = "==1.4.52", extras = ["mypy"]}
+sqlparse = "==0.5.0"
+typing-extensions = "==4.12.2"
+tzlocal = "==5.2"
+urllib3 = "==2.2.2"
+uwsgi = "==2.0.28"
+watchdog = "==4.0.1"
+webassets = "==2.0"
+werkzeug = {version = "==3.0.3", extras = ["watchdog"]}
+beaker = "==1.11.0"
 "repoze.who" = "==2.3"
-requests = "==2.25.1"
-rq = "==1.0"
-simplejson = "==3.10.0"
-sqlparse = "==0.2.2"
-tzlocal = "==1.3"
-webassets = "==0.12.1"
-Babel = "==2.7.0"
-Beaker = "==1.11.0"
-Flask = "==1.1.1"
-Flask-Babel = "==1.0.0"
-Jinja2 = "==2.10.1"
-PyJWT = {version = "==2.1.0",extras = ["crypto"]}
-Markdown = "==2.6.7"
-PyUtilib = "==5.7.1"
-PyYAML = "==5.4.1"
-SQLAlchemy = "==1.3.5"
-Werkzeug = {version = "==1.0.0", extras = ["watchdog"]}
+pyutilib = "==5.7.1"
+ckanext-authz-service = {editable = true, ref = "3d52c13cce5152f1a75f89a21e88c319b6c2ea82", git = "https://github.com/fjelltopp/ckanext-authz-service"}
+ckanext-blob-storage = {editable = true, ref = "eb8ea60cac30dee85bf65329e079f971ca8c90c4", git = "https://github.com/fjelltopp/ckanext-blob-storage"}
+ckanext-pages = {editable = true, ref = "2a92bb874a82a2c008d5764ce290ae6950e428af", git = "https://github.com/ckan/ckanext-pages.git"}
+ckanext-pdfview = {editable = true, ref="e4df796ceb440954d3927bdebe22a25d65e28216", git = "https://github.com/ckan/ckanext-pdfview.git"}  
+ckanext-scheming = {editable = true, git = "https://github.com/ckan/ckanext-scheming.git"} 
 ckan = {path = "./ckan",editable = true}
 ckanext-dms = {path = "./ckanext-dms",editable = true}
-uWSGI = "==2.0.19.1"
-ckanext-authz-service = {editable = true, ref = "bd4c80f55a714c1117a0e130d07463e383c494c7", git = "https://github.com/datopian/ckanext-authz-service"}
-ckanext-blob-storage = {editable = true, ref = "5b2f59217e8f88a3f2cdb9dc50bf4099d9abe0de", git = "https://github.com/fjelltopp/ckanext-blob-storage"}
-ckanext-emailasusername = "==1.0.0"
-ckanext-short-urls = "==0.0.1"
-certifi = "==2020.4.5.1"
-cffi = "==1.14.0"
+ckanext-short-urls = {path = "./ckanext-short-urls",editable = true}
+ckanext-dataset-subscriptions = {path = "./ckanext-dataset-subscriptions",editable = true}    
+cffi = "==1.17.1"
 chardet = "==3.0.4"
+fanstatic = "==1.1"
 giftless-client = "==0.1.1"
-idna = "==2.9"
+pastedeploy = "==2.0.1"
 pycparser = "==2.20"
-six = "==1.14.0"
-typing-extensions = "==3.7.4.1"
-typing = "==3.7.4.1"
-urllib3 = "==1.25.9"
-fanstatic = "==1.1"
+routes = "==1.13"
 sqlalchemy-migrate = "==0.12.0"
+typing = "==3.7.4.1"
 unicodecsv = ">=0.9"
-Routes = "==1.13"
-PasteDeploy = "==2.0.1"
-watchdog = "==2.1.5"
-zope = {interface = "==4.3.2"}
-ckanext-pages = {editable = true, ref = "79d9740ffa048ac25ab94de0a5209db0411d0c42", git = "https://github.com/ckan/ckanext-pages.git"}
-ckanext-dataset-subscriptions = {editable = true, ref = "v1.0.0", git = "https://github.com/fjelltopp/ckanext-dataset-subscriptions"}
-# ckanext-dataset-subscriptions = {path = "./ckanext-dataset-subscriptions",editable = true}
-# dataset-subscriptions requirements
+zope = {interface = "==6.4post2"}
 unihandecode = "==0.81"
 twilio = "==7.7.0"
-# Markupsafe and isdangerous downgraded because of dependencies issue
-markupsafe = "==2.0.1"
-itsdangerous = "==2.0.1"
-ckanext-scheming = {editable = true, git = "https://github.com/ckan/ckanext-scheming.git"}
-ckanext-pdfview = {editable = true, ref="e4df796ceb440954d3927bdebe22a25d65e28216", git = "https://github.com/ckan/ckanext-pdfview.git"}
-ckanext-googleanalytics = "==2.1.1"
+markupsafe = "==2.1.5"
+itsdangerous = "==2.2.0"
+ckanext-googleanalytics = "==2.1.1" 
 oauth2client = "==4.1.3"
 
 [dev-packages]
 beautifulsoup4 = ">=4.9.1"
+ckanapi = "*"
+cookiecutter = ">=1.7.3"
 coveralls = "*"
 docutils = ">=0.16"
 factory-boy = ">=2.12.0"
+flask-debugtoolbar = ">=0.11.0"
 freezegun = ">=1.1.0"
 ipdb = ">=0.13.7"
-responses = ">=0.10.*"
-pycodestyle = ">=2.5.0"
+mock = ">=2.0.0"
 pip-tools = ">=5.1.2"
-sphinx-rtd-theme = ">=0.4.3"
-cookiecutter = ">=1.7.3"
+pycodestyle = ">=2.5.0"
+pydevd-pycharm = "*"
+pyfakefs = ">=3.2"
 pytest = ">=6.2.2"
-pytest-split-tests = ">=1.0.9"
 pytest-cov = ">=2.11.1"
 pytest-freezegun = ">=0.4.2"
 pytest-rerunfailures = ">=9.1.1"
-towncrier = ">=19.2.0"
-Flask-DebugToolbar = ">=0.11.0"
-Sphinx = ">=1.8.5"
-ckanapi = "*"
+pytest-split-tests = ">=1.0.9"
+pytest-factoryboy = "*"
 rarfile = "*"
+responses = ">=0.10.0"
 slugify = "*"
-pydevd-pycharm = "*"
+Sphinx = ">=1.8.5"
+sphinx-rtd-theme = ">=0.4.3"
+towncrier = ">=19.2.0"
 twine = "*"
-mock = ">=2.0.0"
-pyfakefs = ">=3.2"
 pytest-ckan = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.10"