fix: undo accidental changes to config made by rebase

.gitmodules

@@ -25,9 +25,6 @@
 [submodule "ckan-extensions/ckanext-unaids"]
  path = submodules/ckanext-unaids
  url = git@github.com:/fjelltopp/ckanext-unaids.git
-[submodule "ckan-extensions/ckanext-validation"]
- path = submodules/ckanext-validation
- url = git@github.com:frictionlessdata/ckanext-validation.git
 [submodule "ckan-extensions/ckanext-blob-storage"]
  path = submodules/ckanext-blob-storage
  url = git@github.com:/fjelltopp/ckanext-blob-storage.git
@@ -46,5 +43,6 @@
 [submodule "submodules/giftless"]
  path = submodules/giftless
  url = git@github.com:/fjelltopp/giftless.git
-[submodule "submodules/ckanext-validation"]
+[submodule "ckan-extensions/ckanext-validation"]
+ path = submodules/ckanext-validation
  url = git@github.com:fjelltopp/ckanext-validation.git

Pipfile

@@ -104,10 +104,8 @@ python-dotenv = "==1.0.0"
 python-jose = "==3.3.0"
 setuptools = "==67.2.0"
 raven = "==6.10.0"
-
 frictionless = "==5.0.0b9"
 tableschema = "*"
-jinja2 = "==3.0"
 
 [dev-packages]
 beautifulsoup4 = "==4.9.1"

ckan/adx_config.ini

@@ -124,7 +124,7 @@ ckan.redis.url = redis://redis:6379/1
 # Add ``resource_proxy`` to enable resorce proxying and get around the
 # same origin policy
 # Note: Plugins to the left take precendence over plugins to the right!!! Opposite to what you might expect.
-ckan.plugins = unaids fork blob_storage saml2auth emailasusername restricted authz_service stats
+ckan.plugins = unaids fork scheming_datasets blob_storage saml2auth emailasusername restricted authz_service stats
  text_view image_view unaids_recline_view recline_graph_view recline_map_view recline_grid_view
  resource_proxy geo_view pdf_view datastore datapusher geojson_view composite
  validation repeating ytp_request pages dhis2harvester_plugin dhis2_pivot_tables_harvester harvest sentry versions
@@ -165,7 +165,7 @@ ckanext.authz_service.jwt_private_key = -----BEGIN RSA PRIVATE KEY-----
 ckanext.authz_service.jwt_public_key_file = /etc/ckan/jwt_public_key.pem
 ckanext.bulk_file_uploader_default_fields = {"restricted_allowed_orgs": "unaids"}
 
-ckanext.unaids.schema_directory = /usr/lib/adx/submodules/unaids_data_specifications/table_schemas
+ckanext.validation.schema_directory = /usr/lib/adx/submodules/unaids_data_specifications/table_schemas
 ckanext.validation.run_on_create_async = True
 ckanext.validation.run_on_update_async = True
 ckanext.validation.run_on_create_sync = False

ckan/bootstrap.sh

@@ -19,6 +19,9 @@ fi
 rm -rf /usr/lib/adx/submodules/ckan/ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info
 cd /usr/lib/adx/ || exit 1
 pipenv sync --dev
+pipenv run python -m pip install --no-warn-conflicts jinja2==2.11
+pipenv run python -c "import jinja2; print(jinja2.__version__)"
+pipenv run python -m pip freeze
 echo "show current dir"
 ls -la
 echo "Show local/bin"