diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index fc42fbb..1fe47f9 100755 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -1,105 +1,99 @@ -name: upload-pypi - -on: - release: - types: [published] - -permissions: - contents: write - id-token: write - - -jobs: - release-build: - runs-on: ubuntu-latest - - steps: - - name: Set version from release tag - run: echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: "3.x" - - - name: Build release distributions - run: | - # NOTE: put your own distribution build steps here. - python -m pip install build - python -m build - - - name: Upload distributions - uses: actions/upload-artifact@v4 - with: - name: release-dists - path: dist/ - - pypi-publish: - runs-on: ubuntu-latest - needs: - - release-build - permissions: - # IMPORTANT: this permission is mandatory for trusted publishing - id-token: write - - # Dedicated environments with protections for publishing are strongly recommended. - # For more information, see: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#deployment-protection-rules - environment: - name: pypi - # OPTIONAL: uncomment and update to include your PyPI project URL in the deployment status: - #url: https://pypi.org/p/${GITHUB_REPOSITORY#*/} - # - # ALTERNATIVE: if your GitHub Release name is the PyPI project version string - # ALTERNATIVE: exactly, uncomment the following line instead: - url: https://pypi.org/project/${GITHUB_REPOSITORY#*/}/${{ github.event.release.name }} - - steps: - - name: Retrieve release distributions - uses: actions/download-artifact@v4 - with: - name: release-dists - path: dist/ - - - name: Publish release distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: dist/ - sign-package: - runs-on: ubuntu-latest - needs: - - release-build - steps: - - name: Download all the dists - uses: actions/download-artifact@v4 - with: - name: release-dists - path: dist/ - - name: Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@v3.0.0 - with: - inputs: >- - ./dist/*.tar.gz - ./dist/*.whl - publish-to-testpypi: - name: Publish Python 🐍 distribution 📦 to TestPyPI - needs: - - release-build - runs-on: ubuntu-latest - - environment: - name: testpypi - url: https://test.pypi.org/p/${GITHUB_REPOSITORY#*/} - - permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing - - steps: - - name: Download all the dists - uses: actions/download-artifact@v4 - with: - name: release-dists - path: dist/ - - name: Publish distribution 📦 to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/ \ No newline at end of file +name: upload-pypi + +on: + release: + types: [published] + +permissions: + contents: write + id-token: write + + +jobs: + release-build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # required for setuptools-scm to determine version from tags + + - uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Build release distributions + run: | + python -m pip install build + python -m build + + - name: Upload distributions + uses: actions/upload-artifact@v4 + with: + name: release-dists + path: dist/ + + pypi-publish: + runs-on: ubuntu-latest + needs: + - release-build + permissions: + # IMPORTANT: this permission is mandatory for trusted publishing + id-token: write + + environment: + name: pypi + url: https://pypi.org/project/ckanext-matolabtheme/${{ github.event.release.name }} + + steps: + - name: Retrieve release distributions + uses: actions/download-artifact@v4 + with: + name: release-dists + path: dist/ + + - name: Publish release distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + packages-dir: dist/ + + sign-package: + runs-on: ubuntu-latest + needs: + - release-build + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: release-dists + path: dist/ + - name: Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@v3.0.0 + with: + inputs: >- + ./dist/*.tar.gz + ./dist/*.whl + + publish-to-testpypi: + name: Publish Python distribution to TestPyPI + needs: + - release-build + runs-on: ubuntu-latest + + environment: + name: testpypi + url: https://test.pypi.org/p/ckanext-matolabtheme + + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: release-dists + path: dist/ + - name: Publish distribution to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1c73052..60c0b58 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,8 +5,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install requirements @@ -54,14 +54,12 @@ jobs: CKAN_REDIS_URL: redis://redis:6379/1 steps: - - uses: actions/checkout@v3 - - name: Install requirements - run: | - pip install -r requirements.txt - pip install -r dev-requirements.txt - - name: Install requirements (common) + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # required for setuptools-scm + - name: Install extension run: | - pip install -e . + pip install -e ".[dev]" # Replace default path to CKAN core config file with the one on the container sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini - name: Setup extension @@ -70,6 +68,6 @@ jobs: - name: Run tests run: pytest --ckan-ini=test.ini --cov=ckanext.matolabtheme --disable-warnings ckanext/matolabtheme || ([ $? = 5 ] && exit 0 || exit $?) - name: Upload coverage report to codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: - file: ./coverage.xml--cov=ckanext.matolabtheme + files: ./coverage.xml diff --git a/MANIFEST.in b/MANIFEST.in index 3579131..2df58c8 100755 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include README.rst +include README.md include LICENSE include requirements.txt recursive-include ckanext/matolabtheme *.html *.json *.js *.less *.css *.mo *.yml diff --git a/README.md b/README.md index 3cfbe56..b0892ea 100755 --- a/README.md +++ b/README.md @@ -10,15 +10,8 @@ Compatibility with core CKAN versions: | CKAN version | Compatible? | | --------------- | ------------- | | 2.9 and earlier | not tested | -| 2.10 | yes | -| 2.11 | yes | - -Suggested values: - -* "yes" -* "not tested" - I can't think of a reason why it wouldn't work -* "not yet" - there is an intention to get it working -* "no" +| 2.10 | ✓ CI tested | +| 2.11 | ✓ CI tested | ## Installation @@ -66,13 +59,11 @@ If no contact_url is given, it will relate to the about page! ## Developer installation -To install ckanext-csvtocsvw for development, activate your CKAN virtualenv and -do: +To install ckanext-matolabtheme for development, activate your CKAN virtualenv and do: ```bash git clone https://github.com/Mat-O-Lab/ckanext-matolabtheme.git cd ckanext-matolabtheme -python setup.py develop -pip install -r dev-requirements.txt +pip install -e ".[dev]" ``` ## Tests diff --git a/ckanext/matolabtheme/i18n/ckanext-matolabtheme.pot b/ckanext/matolabtheme/i18n/ckanext-matolabtheme.pot index f763afe..745d891 100755 --- a/ckanext/matolabtheme/i18n/ckanext-matolabtheme.pot +++ b/ckanext/matolabtheme/i18n/ckanext-matolabtheme.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-matolabtheme 0.0.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-05-26 08:35+0000\n" +"POT-Creation-Date: 2025-05-27 08:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -224,7 +224,9 @@ msgstr "" msgid "" "Legal basis: The legal basis for processing is Art. 6 par. 1 (b), par. 3 (b) " "GDPR in conjunction with Art. 4 State Data Protection Act " -"\"Landesdatenschutzgesetz\" (LSDG)." +"\"Landesdatenschutzgesetz\" (LSDG) respectively Art. 20 par. 1 KITG in " +"conjunction with Art. 12 par. 1 Higher Education Acts " +"\"Landeshochschulgesetz\" (LHG)." msgstr "" #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:49 @@ -283,9 +285,9 @@ msgid "" "Legal basis: The legal basis for the processing of personal data using " "technically necessary cookies in accordance with § 25 (2) Telecommunications " "Digital Services Data Protection Act \"Telekommunikation-Digitale-Dienste-" -"Datenschutz-Gesetz\" (TDDDG) is Art. 6(1)(f) of the GDPR. The legitimate " -"interest of the operator in data processing according to Art. 6(1)(f) of the " -"GDPR is also present in the aforementioned purposes." +"Datenschutz-Gesetz\" (TDDDG) is Art. 6 par. 1 (e), par. 3 (b) GDPR in " +"conjunction with Art. 4 LDSG respectively Art. 20 par. 1 KITG in conjunction " +"with Art. 12 par. 1 LHG." msgstr "" #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:65 @@ -320,7 +322,8 @@ msgstr "" #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:71 msgid "" "Legal basis: The legal basis for the processing of this data is Art. 6 para. " -"1 lit. e GDPR in conjunction with Art. 4 LDSG or other relevant legal " +"1 lit. e GDPR in conjunction with Art. 4 LDSG respectively Art. 20 para. 1 " +"KITG in conjunction with Art. 12 para. 1 LHG or other relevant legal " "provisions." msgstr "" diff --git a/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.mo b/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.mo index 260e477..4a64fee 100755 Binary files a/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.mo and b/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.mo differ diff --git a/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.po b/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.po index d74e774..2d9fc36 100755 --- a/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.po +++ b/ckanext/matolabtheme/i18n/de/LC_MESSAGES/ckanext-matolabtheme.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-matolabtheme 0.0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-05-26 08:35+0000\n" +"POT-Creation-Date: 2025-05-27 08:34+0000\n" "PO-Revision-Date: 2025-02-10 09:30+0000\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -255,10 +255,13 @@ msgstr "Empfänger: Eine Weitergabe der Daten an Dritte findet nicht statt." msgid "" "Legal basis: The legal basis for processing is Art. 6 par. 1 (b), par. 3 " "(b) GDPR in conjunction with Art. 4 State Data Protection Act " -"\"Landesdatenschutzgesetz\" (LSDG)." +"\"Landesdatenschutzgesetz\" (LSDG) respectively Art. 20 par. 1 KITG in " +"conjunction with Art. 12 par. 1 Higher Education Acts " +"\"Landeshochschulgesetz\" (LHG)." msgstr "" "Die Rechtsgrundlage für die Verarbeitung ist Art. 6 Abs. 1 lit. e, Abs. 3" -" lit. b DS-GVO in Verbindung mit Art. 4 Landesdatenschutzgesetz (LDSG). " +" lit. b DS-GVO in Verbindung mit Art. 4 Landesdatenschutzgesetz (LDSG) " +"bzw. Art. 20 Abs. 1 KITG i.V.m. § 12 Abs. 1 Landeshochschulgesetz (LHG)." #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:49 msgid "" @@ -341,16 +344,14 @@ msgid "" "technically necessary cookies in accordance with § 25 (2) " "Telecommunications Digital Services Data Protection Act " "\"Telekommunikation-Digitale-Dienste-Datenschutz-Gesetz\" (TDDDG) is Art." -" 6(1)(f) of the GDPR. The legitimate interest of the operator in data " -"processing according to Art. 6(1)(f) of the GDPR is also present in the " -"aforementioned purposes." +" 6 par. 1 (e), par. 3 (b) GDPR in conjunction with Art. 4 LDSG " +"respectively Art. 20 par. 1 KITG in conjunction with Art. 12 par. 1 LHG." msgstr "" "Rechtsgrundlage: Die Rechtsgrundlage für die Verarbeitung " "personenbezogener Daten unter Verwendung von technisch erforderlichen " "Cookies i.S.d. § 25 Abs. 2 Telekommunikation-Digitale-Dienste-" -"Datenschutz-Gesetz (TDDDG) ist Art. 6 Abs. 1 lit. f DS-GVO. In o.g. " -"Zwecken liegt auch das berechtigte Interesse des Betreibers an der " -"Datenverarbeitung nach Art. 6 Abs. 1 lit. f DS-GVO." +"Datenschutz-Gesetz (TDDDG) ist Art. 6 Abs. 1 lit. e, Abs. 3 lit. b DS-GVO" +" i.V.m. Art. 4 LSDG bzw. Art. 20 Abs. 1 KITG i.V.m Art. 12 Abs. 1 LHG." #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:65 msgid "" @@ -401,12 +402,14 @@ msgstr "" #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:71 msgid "" "Legal basis: The legal basis for the processing of this data is Art. 6 " -"para. 1 lit. e GDPR in conjunction with Art. 4 LDSG or other relevant " +"para. 1 lit. e GDPR in conjunction with Art. 4 LDSG respectively Art. 20 " +"para. 1 KITG in conjunction with Art. 12 para. 1 LHG or other relevant " "legal provisions." msgstr "" "Rechtsgrundlage: Die Rechtsgrundlage für die Verarbeitung dieser Daten " -"ist Art. 6 Abs. 1 lit. e DS-GVO i.V.m. Art. 4 LDSG, bzw. weitere in Frage" -" kommende Rechtsvorschriften." +"ist Art. 6 Abs. 1 lit. e DS-GVO i.V.m. Art. 4 LDSG, bzw. Art. 20 Abs. 1 " +"KITG i.V.m Art. 12 Abs. 1 LHGoder weiteren in Frage kommende " +"Rechtsvorschriften." #: ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html:72 msgid "" diff --git a/ckanext/matolabtheme/public/static/Logo.svg b/ckanext/matolabtheme/public/static/Logo.svg index 784f243..ceab44c 100755 --- a/ckanext/matolabtheme/public/static/Logo.svg +++ b/ckanext/matolabtheme/public/static/Logo.svg @@ -1,21 +1,516 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + +Zeichenfläche 1 Kopie 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Zeichenfläche 1 Kopie 2 diff --git a/ckanext/matolabtheme/public/static/banner_bottom.png b/ckanext/matolabtheme/public/static/banner_bottom.png index 23b0bb2..40b94c0 100755 Binary files a/ckanext/matolabtheme/public/static/banner_bottom.png and b/ckanext/matolabtheme/public/static/banner_bottom.png differ diff --git a/ckanext/matolabtheme/public/static/banner_top.png b/ckanext/matolabtheme/public/static/banner_top.png index 23b0bb2..8a13f2b 100755 Binary files a/ckanext/matolabtheme/public/static/banner_top.png and b/ckanext/matolabtheme/public/static/banner_top.png differ diff --git a/ckanext/matolabtheme/public/static/favicon.png b/ckanext/matolabtheme/public/static/favicon.png index 848f43e..43ab067 100755 Binary files a/ckanext/matolabtheme/public/static/favicon.png and b/ckanext/matolabtheme/public/static/favicon.png differ diff --git a/ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html b/ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html index d653c73..e27f30e 100755 --- a/ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html +++ b/ckanext/matolabtheme/templates/matolabtheme/dataprivacy.html @@ -45,7 +45,7 @@

{{ _("Accessing the website and server log files (visiting the p

{{ _("Scope and Purpose: When using the website for information purposes only, i.e. when you do not register or transmit other information, we will only collect the personal data that are transmitted by your browser to our server according to the settings made by you. The data serves the technical optimization of the website and to ensure the security of our information technology systems. The IP address is necessary for the operation or delivery of the website, is shortened in the log files, and is no longer available as a whole after the request. A direct conclusion about individual persons is not possible based on this data. A matching with other data records does not take place. We reserve the right to review this data retrospectively if we become aware of specific indications of illegal use.")}}

{{ _("Recipient: There is no transfer of data to third parties.")}}

-

{{ _("Legal basis: The legal basis for processing is Art. 6 par. 1 (b), par. 3 (b) GDPR in conjunction with Art. 4 State Data Protection Act \"Landesdatenschutzgesetz\" (LSDG).")}}

+

{{ _("Legal basis: The legal basis for processing is Art. 6 par. 1 (b), par. 3 (b) GDPR in conjunction with Art. 4 State Data Protection Act \"Landesdatenschutzgesetz\" (LSDG) respectively Art. 20 par. 1 KITG in conjunction with Art. 12 par. 1 Higher Education Acts \"Landeshochschulgesetz\" (LHG).")}}

{{ _("Storage duration: The personal data will be stored as long as it is necessary to achieve the purpose for which it was collected. The data will be deleted after a maximum of seven days.") }}

{{ _("Example of processing:")}}

@@ -61,14 +61,14 @@

{{ _("Cookies") }}

  • {{ _("Anonymous user ID as UUID") }}

    • {{ _("Recipient: There is no transfer of data to third parties.")}}

    -

    {{ _("Legal basis: The legal basis for the processing of personal data using technically necessary cookies in accordance with § 25 (2) Telecommunications Digital Services Data Protection Act \"Telekommunikation-Digitale-Dienste-Datenschutz-Gesetz\" (TDDDG) is Art. 6(1)(f) of the GDPR. The legitimate interest of the operator in data processing according to Art. 6(1)(f) of the GDPR is also present in the aforementioned purposes.")}}

    +

    {{ _("Legal basis: The legal basis for the processing of personal data using technically necessary cookies in accordance with § 25 (2) Telecommunications Digital Services Data Protection Act \"Telekommunikation-Digitale-Dienste-Datenschutz-Gesetz\" (TDDDG) is Art. 6 par. 1 (e), par. 3 (b) GDPR in conjunction with Art. 4 LDSG respectively Art. 20 par. 1 KITG in conjunction with Art. 12 par. 1 LHG.")}}

    {{ _("Storage duration: The session cookies will be deleted at the latest when you close the browser.")}}

    {{ _("Contact (Email, Phone, Forms)") }}

    {{ _("Scope and purpose: If you contact us by e-mail, telephone or via a form, the contact details you provide, such as your e-mail address, telephone number and, if applicable, your name, will be stored for the purpose of processing and responding to your request. We would like to point out that data transmission (e.g. when communicating by e-mail) may be subject to security vulnerabilities. Complete protection of data against access by third parties is not possible.")}}

    {{ _("Recipient: If necessary for the response to your contact, personal data may be forwarded to responsible parties within the operator. The respective responsible employees of the operator use your personal data solely for processing your inquiry. There is no transfer of data to third parties.")}}

    -

    {{ _("Legal basis: The legal basis for the processing of this data is Art. 6 para. 1 lit. e GDPR in conjunction with Art. 4 LDSG or other relevant legal provisions.")}}

    +

    {{ _("Legal basis: The legal basis for the processing of this data is Art. 6 para. 1 lit. e GDPR in conjunction with Art. 4 LDSG respectively Art. 20 para. 1 KITG in conjunction with Art. 12 para. 1 LHG or other relevant legal provisions.")}}

    {{ _("Storage duration: The personal data will be stored as long as it is necessary to fulfill the aforementioned purpose, meaning the data will be deleted when it can be assumed that further communication is no longer desired.")}}

    {{ _("Registration process as a user") }}

    diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..19b5f5e --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,68 @@ +[build-system] +requires = ["setuptools>=64", "setuptools-scm>=8"] +build-backend = "setuptools.build_meta" + +[project] +name = "ckanext-matolabtheme" +dynamic = ["version"] +description = "CKAN theme of the Mat-O-Lab Project, changes landing Page and adds alternative Data Privacy Act in English and German." +readme = "README.md" +license = { text = "AGPL" } +authors = [{ name = "Thomas Hanke", email = "thomas.hanke@iwm.fraunhofer.de" }] +keywords = ["CKAN", "Theme"] +classifiers = [ + "Development Status :: 4 - Beta", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", +] +requires-python = ">=3.10" +dependencies = [ + "requests>=2.4.2", + "sqlalchemy", +] + +[project.urls] +Homepage = "https://github.com/Mat-O-Lab/ckanext-matolabtheme" +Repository = "https://github.com/Mat-O-Lab/ckanext-matolabtheme" + +[project.entry-points."ckan.plugins"] +matolabtheme = "ckanext.matolabtheme.plugin:MatolabthemePlugin" + +[project.entry-points."babel.extractors"] +ckan = "ckan.lib.extract:extract_ckan" + +[project.optional-dependencies] +dev = ["pytest", "pytest-ckan"] + +[tool.setuptools.packages.find] +include = ["ckanext*"] + +[tool.setuptools.package-data] +"ckanext.matolabtheme" = [ + "templates/**/*.html", + "public/**/*.svg", + "public/**/*.png", + "assets/**/*.css", + "assets/**/*.js", + "assets/**/*.less", + "i18n/**/*.mo", + "i18n/**/*.po", + "migration/**/*.ini", + "migration/**/*.py", + "migration/**/*.mako", + "*.json", + "*.yml", +] + +[tool.setuptools_scm] +# Version automatically derived from git tags (e.g. v1.0.6 -> 1.0.6) + +[tool.pytest.ini_options] +filterwarnings = [ + "ignore::sqlalchemy.exc.SADeprecationWarning", + "ignore::sqlalchemy.exc.SAWarning", + "ignore::DeprecationWarning", +] +addopts = "--ckan-ini test.ini" diff --git a/requirements.txt b/requirements.txt index 3191df7..0e90d24 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,2 @@ requests>=2.4.2 sqlalchemy -pytest -pytest-ckan \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 187ced5..02a2f01 100755 --- a/setup.cfg +++ b/setup.cfg @@ -1,37 +1,3 @@ -[metadata] -name = ckanext-matolabtheme -version = 0.0.1 -description = Theme for Mat-O-Lab Data Portal -long_description = file: README.md -long_description_content_type = text/markdown -url = https://github.com/Mat-O-Lab/ckanext-matolabtheme -author = Thomas Hanke -author_email = thomas.hanke@iwm.fraunhofer.d -license = AGPL -classifiers = - Development Status :: 4 - Beta - License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+) - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 -keywords = CKAN Theme - -[options] -packages = find: -namespace_packages = ckanext -install_requires = -include_package_data = True - -[options.entry_points] -ckan.plugins = - matolabtheme = ckanext.matolabtheme.plugin:MatolabthemePlugin - -babel.extractors = - ckan = ckan.lib.extract:extract_ckan - -[options.extras_require] - [extract_messages] keywords = translate isPlural add_comments = TRANSLATORS: @@ -53,10 +19,3 @@ previous = true domain = ckanext-matolabtheme directory = ckanext/matolabtheme/i18n statistics = true - -[tool:pytest] -filterwarnings = - ignore::sqlalchemy.exc.SADeprecationWarning - ignore::sqlalchemy.exc.SAWarning - ignore::DeprecationWarning -addopts = --ckan-ini test.ini diff --git a/setup.py b/setup.py deleted file mode 100755 index a878282..0000000 --- a/setup.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -from codecs import open # To use a consistent encoding -from os import path, environ - -from setuptools import find_packages, setup # Always prefer setuptools over distutils - -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() - -with open(path.join(here,"requirements.txt")) as f: - requirements = f.read().splitlines() - -setup( - name="""ckanext-matolabtheme""", - # 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 - version=environ.get('VERSION', '0.0.0'), - description="""CKAN theme of the Mat-O-Lab Project, changes landing Page and add alternative Data Privacy Act in English and German.""", - long_description=long_description, - long_description_content_type="text/markdown", - install_requires=requirements, - # The project's main homepage. - url="https://github.com/Mat-O-Lab/ckanext-matolabtheme", - # Author details - author="""Thomas Hanke""", - author_email="""thomas.hanke@iwm.fraunhofer.de""", - # Choose your license - license="AGPL", - packages=find_packages(), - include_package_data=True, - message_extractors={ - 'ckanext': [ - ('**.py', 'python', None), - ('**.js', 'javascript', None), - ('**/templates/**.html', 'ckan', None), - ], - }, - entry_points=""" - [ckan.plugins] - matolabtheme=ckanext.matolabtheme.plugin:MatolabthemePlugin - """, - -)