adjust pyprojects

clarin-eric · Apr 16, 2024 · 5860220 · 5860220
1 parent e2bd6f5
commit 5860220
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 48 deletions.
diff --git a/dogapi/dogapi/views_api.py b/dogapi/dogapi/views_api.py
@@ -102,7 +102,7 @@ def fetch(request: Request) -> Response:
             expand_datatype_flag = False
 
 
-        fetch_result: dict = {pid: dog.fetch(pid) for pid in pids}
+        fetch_result: dict = {pid: dog.fetchs(pid) for pid in pids}
         if not bool(fetch_result):
             ret = Response(f"All Persistent Identifiers are either incorrect or unrecognised", status=400)
         else:
@@ -358,7 +358,7 @@ def expand_datatype(request: Request) -> Response:
     data_types = parse_queryparam(request, 'data_type')
     expanded_datatypes: dict = {}
     for data_type in data_types:
-        expanded_datatypes.update(doglib_expand_datatype(data_type))
+        expanded_datatypes.update(doglib_expand_datatype(data_type, dtr=settings.DTR_INTEGRATION))
     if expanded_datatypes:
         return Response(expanded_datatypes, status=200)
     else:

diff --git a/dogapi/pyproject.toml b/dogapi/pyproject.toml
@@ -1,17 +1,6 @@
 [tool.poetry]
 name = "dogapi"
-description = "Django API views serving Digital Object Gate functionalities"
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Framework :: Django :: 4.1",
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-]
 authors = [
     "Michał Gawor <m.j.gawor@uu.nl>",
 ]
 
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
diff --git a/dogconfig/dogproject/settings.py b/dogconfig/dogproject/settings.py
@@ -26,6 +26,7 @@
 ADMIN_ENABLED = False
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True # TODO: templatize
+DTR_INTEGRATION = True
 SESSION_COOKIE_SECURE = not DEBUG
 SESSION_COOKIE_HTTPONLY = True
 CSRF_COOKIE_SECURE = not DEBUG
@@ -175,6 +176,8 @@
     }
 }
 
+
+
 # Internationalization
 # https://docs.djangoproject.com/en/3.2/topics/i18n/
 

diff --git a/dogconfig/pyproject.toml b/dogconfig/pyproject.toml
@@ -1,26 +1,10 @@
 [tool.poetry]
 name = "dogconfig"
-description = "Django web application providing Digital Object Gates functionality"
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Framework :: Django :: 4.1",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3",
-]
+description = "Django Digital Object Gate project configuration"
 authors = [
     "Michal Gawor <m.j.gawor@uu.nl>"
 ]
 packages = [
     { include = "dogproject"},
 ]
 
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.dependencies]
-dogapi = ">=1.0.1-a1"
-dogui = ">=1.0.1-a1"
-django-debug-toolbar = ">=4.1.0"
-pymemcache = ">=4.0.0"
diff --git a/dogui/pyproject.toml b/dogui/pyproject.toml
@@ -1,20 +1,7 @@
 [tool.poetry]
 name = "dogui"
 description = "Django UI templates for Digital Object Gate API consumption"
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Framework :: Django :: 4.1",
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-]
-authors = [
-    "Michał Gawor <m.j.gawor@uu.nl>"
-]
 packages = [
     { include = "dogui" }
 ]
 
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,8 @@
 [tool.poetry]
-name = "DOGapp"
+name = "dogapp"
 description = "CLARIN Centre Registry Django project configuration"
-version = "1.0.2-rc3"
-license = "../LICENSE.txt"
+version = "0.0.0dev"
+license = "./LICENSE.txt"
 authors = [
     "Beatriz Sanchez Bribian",
     "Michał Gawor <michal@clarin.eu>",
@@ -20,13 +20,14 @@ packages = [
 ]
 
 [tool.poetry.urls]
-changelog = "https://github.com/clarin-eric/DOGapp/blob/main/LICENSE"
+changelog = "https://github.com/clarin-eric/DOGapp/blob/main/CHANGELOG.md"
 documentation = "https://github.com/clarin-eric/DOGapp/"
 homepage = ""
 repository = "https://github.com/clarin-eric/DOGapp/"
 
 [tool.poetry.dependencies]
-doglib = { url = "https://github.com/clarin-eric/DOGlib/releases/download/1.0.6-rc1/doglib-1.0.6rc1-py3-none-any.whl" }
+doglib = { url =
+"https://github.com/clarin-eric/DOGlib/releases/download/1.0.6/doglib-1.0.6-py3-none-any.whl" } 
 Django = '4.2.11'
 django-debug-toolbar = '4.3.0'
 djangorestframework = '3.15.1'