From f109dd2898f9d55b0d5f5eddf45ac068bf7ffcc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:43:56 +0000 Subject: [PATCH 1/2] chore(deps): bump apis-core-rdf from 0.32.0 to 0.33.0 Bumps [apis-core-rdf](https://github.com/acdh-oeaw/apis-core-rdf) from 0.32.0 to 0.33.0. - [Release notes](https://github.com/acdh-oeaw/apis-core-rdf/releases) - [Changelog](https://github.com/acdh-oeaw/apis-core-rdf/blob/main/CHANGELOG.md) - [Commits](https://github.com/acdh-oeaw/apis-core-rdf/compare/apis-core-rdf-v0.32.0...v0.33.0) --- updated-dependencies: - dependency-name: apis-core-rdf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 53 ++++---------------------------------------------- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 50 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1b5be14..acd21c1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -20,20 +20,6 @@ doc = ["Sphinx (>=7.4,<8.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "truststore (>=0.9.1)", "uvloop (>=0.21.0b1)"] trio = ["trio (>=0.26.1)"] -[[package]] -name = "anytree" -version = "2.12.1" -description = "Powerful and Lightweight Python Tree Data Structure with various plugins" -optional = false -python-versions = ">=3.7.2,<4" -files = [ - {file = "anytree-2.12.1-py3-none-any.whl", hash = "sha256:5ea9e61caf96db1e5b3d0a914378d2cd83c269dfce1fb8242ce96589fa3382f0"}, - {file = "anytree-2.12.1.tar.gz", hash = "sha256:244def434ccf31b668ed282954e5d315b4e066c4940b94aff4a7962d85947830"}, -] - -[package.dependencies] -six = "*" - [[package]] name = "apis-acdhch-default-settings" version = "1.5.0" @@ -62,20 +48,19 @@ whitenoise = ">=5.2.0,<6.0.0" [[package]] name = "apis-core-rdf" -version = "0.32.0" +version = "0.33.0" description = "Base package for the APIS framework" optional = false python-versions = "<4.0,>=3.11" files = [ - {file = "apis_core_rdf-0.32.0-py3-none-any.whl", hash = "sha256:b2b59910fccfc199030487bffcd7f8e75e7cbde97d97780ab8de6d73d9dbed57"}, - {file = "apis_core_rdf-0.32.0.tar.gz", hash = "sha256:4619b3bb300e057758a95deec4b8894ff61d1859ce6570dfe257cd6d0f6bd432"}, + {file = "apis_core_rdf-0.33.0-py3-none-any.whl", hash = "sha256:3edf10e45284ee9df817fee9b6ee0d79f3d41c18026c7bb98f6f28e44220c222"}, + {file = "apis_core_rdf-0.33.0.tar.gz", hash = "sha256:dbcb79ea99f256615353c0d722db32cbf0d8b51003f4fde9d8e22e9caf00d1ee"}, ] [package.dependencies] apis-override-select2js = ">=0.1,<0.3" crispy-bootstrap4 = ">=2023.1,<2025.0" Django = ">5" -django-admin-csvexport = ">=2.2,<3.0" django-autocomplete-light = ">=3.9.4,<3.12.0" django-crispy-forms = ">=2,<3" django-crum = ">=0.7.9,<0.8.0" @@ -674,21 +659,6 @@ files = [ [package.dependencies] django = ">=4.1" -[[package]] -name = "django-admin-csvexport" -version = "2.3" -description = "Django-admin-action to export items as csv-formatted data." -optional = false -python-versions = "*" -files = [ - {file = "django_admin_csvexport-2.3-py3-none-any.whl", hash = "sha256:5f80a74349e44fd0220b3323317571da2f17a7d5710e85b2687551ca1b83c2b6"}, - {file = "django_admin_csvexport-2.3.tar.gz", hash = "sha256:2f065120b96cec92b9cde39d44df0669c3d9b9ec062d8c805e24091d8f81addc"}, -] - -[package.dependencies] -Django = ">=2.2" -django-modeltree = ">=0.3" - [[package]] name = "django-allow-cidr" version = "0.6.0" @@ -840,21 +810,6 @@ files = [ [package.dependencies] Django = ">=3.2" -[[package]] -name = "django-modeltree" -version = "0.5" -description = "TODO" -optional = false -python-versions = "*" -files = [ - {file = "django-modeltree-0.5.tar.gz", hash = "sha256:28d269a4a3c4637c88c74bb8abc4fab1632c0f90ff3bf0e12fe3f45953dbb559"}, - {file = "django_modeltree-0.5-py3-none-any.whl", hash = "sha256:93c460c44f06feafc3cdf699b567c235944c6f6cb54d90f18de33582523592e1"}, -] - -[package.dependencies] -anytree = "*" -Django = "*" - [[package]] name = "django-select2" version = "8.2.1" @@ -3688,4 +3643,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "115a42a201e1316ce3ef01fb8357c86c4dfc4c4f5467805be40c1f85d92d4fd8" +content-hash = "db1b85eada5169f4fc0d67085f19aa101f81f2e8fcdd7316a786f2c3d4acb879" diff --git a/pyproject.toml b/pyproject.toml index c3f14f4..c8dcad7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ packages = [{include = "apis_ontology"}] [tool.poetry.dependencies] python = "^3.11" psycopg2 = "^2.9" -apis-core-rdf = "0.32.0" +apis-core-rdf = "0.33.0" apis-acdhch-default-settings = "1.5.0" django-acdhch-functions = "^0.1.3" django-extensions = "^3.1.3" From f9556589177352dbd93d8d6b011b93ce0d30abed Mon Sep 17 00:00:00 2001 From: Gytha Ogg Date: Thu, 28 Nov 2024 08:18:39 +0100 Subject: [PATCH 2/2] update templates to use new template lookup reference: 9605817e04674e1c91338acec515dbd7234d93ae --- .../instance_card_table.html} | 0 .../templates/apis_ontology/instance_detail.html | 6 ------ .../object_card_table.html} | 0 .../person_card_table.html} | 0 .../templates/apis_ontology/person_detail.html | 6 ------ .../place_card_table.html} | 0 .../templates/apis_ontology/place_detail.html | 16 ---------------- .../work_card_table.html} | 0 .../templates/apis_ontology/work_detail.html | 6 ------ 9 files changed, 34 deletions(-) rename apis_ontology/templates/{generic/partials/instance_table.html => apis_ontology/instance_card_table.html} (100%) delete mode 100644 apis_ontology/templates/apis_ontology/instance_detail.html rename apis_ontology/templates/{generic/partials/object_table.html => apis_ontology/object_card_table.html} (100%) rename apis_ontology/templates/{generic/partials/person_table.html => apis_ontology/person_card_table.html} (100%) delete mode 100644 apis_ontology/templates/apis_ontology/person_detail.html rename apis_ontology/templates/{generic/partials/place_table.html => apis_ontology/place_card_table.html} (100%) rename apis_ontology/templates/{generic/partials/work_table.html => apis_ontology/work_card_table.html} (100%) delete mode 100644 apis_ontology/templates/apis_ontology/work_detail.html diff --git a/apis_ontology/templates/generic/partials/instance_table.html b/apis_ontology/templates/apis_ontology/instance_card_table.html similarity index 100% rename from apis_ontology/templates/generic/partials/instance_table.html rename to apis_ontology/templates/apis_ontology/instance_card_table.html diff --git a/apis_ontology/templates/apis_ontology/instance_detail.html b/apis_ontology/templates/apis_ontology/instance_detail.html deleted file mode 100644 index 4b0a9d6..0000000 --- a/apis_ontology/templates/apis_ontology/instance_detail.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "apis_ontology/tibscholentitymixin_detail.html" %} -{% block col-zero %} -
-
{% include "generic/partials/instance_table.html" %}
-
-{% endblock col-zero %} diff --git a/apis_ontology/templates/generic/partials/object_table.html b/apis_ontology/templates/apis_ontology/object_card_table.html similarity index 100% rename from apis_ontology/templates/generic/partials/object_table.html rename to apis_ontology/templates/apis_ontology/object_card_table.html diff --git a/apis_ontology/templates/generic/partials/person_table.html b/apis_ontology/templates/apis_ontology/person_card_table.html similarity index 100% rename from apis_ontology/templates/generic/partials/person_table.html rename to apis_ontology/templates/apis_ontology/person_card_table.html diff --git a/apis_ontology/templates/apis_ontology/person_detail.html b/apis_ontology/templates/apis_ontology/person_detail.html deleted file mode 100644 index b94dbb6..0000000 --- a/apis_ontology/templates/apis_ontology/person_detail.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "apis_ontology/tibscholentitymixin_detail.html" %} -{% block col-zero %} -
-
{% include "generic/partials/person_table.html" %}
-
-{% endblock col-zero %} diff --git a/apis_ontology/templates/generic/partials/place_table.html b/apis_ontology/templates/apis_ontology/place_card_table.html similarity index 100% rename from apis_ontology/templates/generic/partials/place_table.html rename to apis_ontology/templates/apis_ontology/place_card_table.html diff --git a/apis_ontology/templates/apis_ontology/place_detail.html b/apis_ontology/templates/apis_ontology/place_detail.html index 80a4788..4eab9d9 100644 --- a/apis_ontology/templates/apis_ontology/place_detail.html +++ b/apis_ontology/templates/apis_ontology/place_detail.html @@ -1,22 +1,6 @@ {% extends "apis_core/apis_entities/e53_place_detail.html" %} {% load static %} - -{% block col-zero %} -
-
{% include "generic/partials/place_table.html" %}
-
- - {% if object.latitude and object.longitude %} - - {% endif %} -
{{ object }}
-
-
{% include "apis_entities/partials/linked_open_data.html" %}
-
-{% endblock %} {% block relations-include %} {% include "relations/list_relations_include_tabs.html" %} {% endblock relations-include %} diff --git a/apis_ontology/templates/generic/partials/work_table.html b/apis_ontology/templates/apis_ontology/work_card_table.html similarity index 100% rename from apis_ontology/templates/generic/partials/work_table.html rename to apis_ontology/templates/apis_ontology/work_card_table.html diff --git a/apis_ontology/templates/apis_ontology/work_detail.html b/apis_ontology/templates/apis_ontology/work_detail.html deleted file mode 100644 index fcf9562..0000000 --- a/apis_ontology/templates/apis_ontology/work_detail.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "apis_ontology/tibscholentitymixin_detail.html" %} -{% block col-zero %} -
-
{% include "generic/partials/work_table.html" %}
-
-{% endblock col-zero %}