[SUPDESQ-187] Upgrade for ckan 2 11

MANIFEST.in

@@ -1,4 +1,6 @@
 include README.MD
 include LICENSE
 include requirements.txt
-recursive-include ckanext/qdes_schema *.html *.json *.js *.less *.css *.mo
+recursive-include ckanext/qdes_schema *.html *.json *.js *.less *.css *.mo
+recursive-include ckanext/qdes_schema/migration *.ini *.py *.mako
+recursive-include ckanext/qdes_schema/public *.*

ckanext/qdes_schema/templates/group/read.html

@@ -10,9 +10,9 @@
     <div>
       {% for facet in facet_titles %}
         {% if facet == 'temporal_start' or facet == 'temporal_end' %}
-          {{ h.snippet('snippets/facet_list_temporal.html', title=facet_titles[facet], name=facet, search_facets=search_facets, extras={'id':group_dict.id}) }}
+          {% snippet 'snippets/facet_list_temporal.html', title=facet_titles[facet], name=facet, search_facets=search_facets, extras={'id':group_dict.id} %}
         {% elif not facet in ['collection_package_id', 'temporal_coverage_from', 'temporal_coverage_to'] %}
-          {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id}) }}
+          {% snippet'snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id} %}
         {% endif %}
       {% endfor %}
     </div>

ckanext/qdes_schema/templates/organization/read.html

@@ -8,9 +8,9 @@
     <div>
       {% for facet in facet_titles %}
         {% if facet == 'temporal_start' or facet == 'temporal_end' %}
-          {{ h.snippet('snippets/facet_list_temporal.html', title=facet_titles[facet], name=facet, search_facets=search_facets, extras={'id':group_dict.id}) }}
+          {% snippet 'snippets/facet_list_temporal.html', title=facet_titles[facet], name=facet, search_facets=search_facets, extras={'id':group_dict.id} %}
         {% elif not facet in ['collection_package_id', 'temporal_coverage_from', 'temporal_coverage_to'] %}
-          {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id}) }}
+         {% snippet'snippets/facet_list.html', title=facet_titles[facet], name=facet, extras={'id':group_dict.id} %}
         {% endif %}
       {% endfor %}
     </div>

ckanext/qdes_schema/templates/package/search.html

@@ -29,9 +29,9 @@
     <div>
       {% for facet in facet_titles %}
         {% if facet == 'temporal_start' or facet == 'temporal_end' %}
-          {{ h.snippet('snippets/facet_list_temporal.html', title=facet_titles[facet], name=facet, search_facets=search_facets) }}
+          {% snippet'snippets/facet_list_temporal.html', title=facet_titles[facet], name=facet, search_facets=search_facets %}
         {% elif not facet in ['collection_package_id', 'temporal_coverage_from', 'temporal_coverage_to'] %}
-          {{ h.snippet('snippets/facet_list.html', title=facet_titles[facet], name=facet, search_facets=search_facets) }}
+          {% snippet'snippets/facet_list.html', title=facet_titles[facet], name=facet, search_facets=search_facets %}
         {% endif %}
       {% endfor %}
     </div>

ckanext/qdes_schema/templates/scheming/package/snippets/package_form.html

@@ -4,7 +4,7 @@
 
 {% block stages %}
   {% if dataset_type != 'dataservice' and form_style == 'new' %}
-    {{ h.snippet('package/snippets/stages.html', stages=stage) }}
+    {% snippet 'package/snippets/stages.html', stages=stage %}
   {% endif %}
 {% endblock %}
 

pyproject.toml

@@ -0,0 +1,42 @@
+[project]
+name = "ckanext-qdes-schema"
+version = "3.0.1"
+description = "CKAN extension for QDES"
+authors = [
+	{name = "Salsa Digital", email = "[email protected]"},
+	]
+maintainers = [
+	{name = "Mark Calvert", email = "[email protected]"},
+	{name = "Konstantin Sivakov", email = "[email protected]"},
+	{name = "Awang Setyawan", email = "[email protected]"},
+	]
+license = { text = "AGPL-3.0" }
+readme = "README.md"
+classifiers = [
+	"Development Status :: 5 - Production/Stable",
+	"Framework :: CKAN",
+	"Intended Audience :: Developers",
+	"License :: OSI Approved :: GNU Affero General Public License v3",
+	"Programming Language :: Python :: 3.9",
+	"Programming Language :: Python :: 3.10",
+	"Programming Language :: Python :: 3.11",
+	"Programming Language :: Python :: 3.12",
+	"Topic :: Internet :: WWW/HTTP",
+	"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+	"Topic :: Software Development :: Libraries :: Python Modules",
+	]
+keywords = ["ckan", "extension", "qdes"]
+
+dependencies = []
+
+[project.urls]
+Repository = "https://github.com/salsadigitalauorg/ckanext-qdes-schema"
+
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project.entry-points."ckan.plugins"]
+qdes_schema="ckanext.qdes_schema.plugin:QDESSchemaPlugin"
+qdes_schema_resources="ckanext.qdes_schema.plugin_resources:QDESSchemaResourcesPlugin"

setup.cfg

@@ -1,3 +1,13 @@
+[options]
+packages = find:
+namespace_packages = ckanext
+install_requires =
+include_package_data = True
+
+[options.entry_points]
+babel.extractors =
+    ckan = ckan.lib.extract:extract_ckan
+
 [extract_messages]
 keywords = translate isPlural
 add_comments = TRANSLATORS:

setup.py

@@ -1,100 +1,7 @@
 # -*- coding: utf-8 -*-
-from setuptools import setup, find_packages  # Always prefer setuptools over distutils
-from codecs import open  # To use a consistent encoding
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-
-# Get the long description from the relevant file
-with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
+from setuptools import setup
 
 setup(
-    name='''ckanext-qdes-schema''',
-
-    # Versions should comply with PEP440.  For a discussion on single-sourcing
-    # the version across setup.py and the project code, see
-    # http://packaging.python.org/en/latest/tutorial.html#version
-    version='0.0.1',
-
-    description='''Customised CKAN metadata schema for QDES''',
-    long_description=long_description,
-
-    # The project's main homepage.
-    url='https://github.com//ckanext-qdes-schema',
-
-    # Author details
-    author='''Salsa Digital''',
-    author_email='''''',
-
-    # Choose your license
-    license='AGPL',
-
-    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers=[
-        # How mature is this project? Common values are
-        # 3 - Alpha
-        # 4 - Beta
-        # 5 - Production/Stable
-        'Development Status :: 4 - Beta',
-
-        # Pick your license as you wish (should match "license" above)
-        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2.7',
-    ],
-
-
-    # What does your project relate to?
-    keywords='''CKAN''',
-
-    # You can just specify the packages manually here if your project is
-    # simple. Or you can use find_packages().
-    packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
-    namespace_packages=['ckanext'],
-
-    install_requires=[
-      # CKAN extensions should not list dependencies here, but in a separate
-      # ``requirements.txt`` file.
-      #
-      # http://docs.ckan.org/en/latest/extensions/best-practices.html#add-third-party-libraries-to-requirements-txt
-    ],
-
-    # If there are data files included in your packages that need to be
-    # installed, specify them here.  If using Python 2.6 or less, then these
-    # have to be included in MANIFEST.in as well.
-    include_package_data=True,
-    package_data={
-    },
-
-    # Although 'package_data' is the preferred approach, in some case you may
-    # need to place data files outside of your packages.
-    # see http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files
-    # In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
-    data_files=[],
-
-    # To provide executable scripts, use entry points in preference to the
-    # "scripts" keyword. Entry points provide cross-platform support and allow
-    # pip to create the appropriate form of executable for the target platform.
-    entry_points='''
-        [ckan.plugins]
-        qdes_schema=ckanext.qdes_schema.plugin:QDESSchemaPlugin
-        qdes_schema_resources=ckanext.qdes_schema.plugin_resources:QDESSchemaResourcesPlugin
-
-        [babel.extractors]
-        ckan = ckan.lib.extract:extract_ckan
-
-        [ckan.rdf.profiles]
-        qdes_dcat=ckanext.qdes_schema.dcat.profiles:QDESDCATProfile
-
-    ''',
-
-    # If you are changing from the default layout of your extension, you may
-    # have to change the message extractors, you can read more about babel
-    # message extraction at
-    # http://babel.pocoo.org/docs/messages/#extraction-method-mapping-and-configuration
     message_extractors={
         'ckanext': [
             ('**.py', 'python', None),