udata 7.0.7.dev28493__py2.py3-none-any.whl → 7.0.7.dev28563__py2.py3-none-any.whl

udata/core/badges/api.py

@@ -1,15 +1,8 @@
-from udata.api import api, fields
+from udata.api import api
 
 from .forms import badge_form
 
 
-badge_fields = api.model('Badge', {
-    'kind': fields.String(description=('Kind of badge (certified, etc), '
-                                       'specific to each model'),
-                          required=True),
-})
-
-
 def add(obj):
     '''
     Handle a badge add API.

udata/core/badges/fields.py

@@ -0,0 +1,7 @@
+from udata.api import api, fields
+
+badge_fields = api.model('Badge', {
+    'kind': fields.String(description=('Kind of badge (certified, etc), '
+                                       'specific to each model'),
+                          required=True),
+})

udata/core/dataset/api.py

@@ -34,6 +34,7 @@ from udata.core import storages
 from udata.core.dataset.models import CHECKSUM_TYPES
 from udata.core.storages.api import handle_upload, upload_parser
 from udata.core.badges import api as badges_api
+from udata.core.badges.fields import badge_fields
 from udata.core.followers.api import FollowAPI
 from udata.utils import get_by
 from udata.rdf import (
@@ -314,8 +315,8 @@ class AvailableDatasetBadgesAPI(API):
 @ns.route('/<dataset:dataset>/badges/', endpoint='dataset_badges')
 class DatasetBadgesAPI(API):
     @api.doc('add_dataset_badge', **common_doc)
-    @api.expect(badges_api.badge_fields)
-    @api.marshal_with(badges_api.badge_fields)
+    @api.expect(badge_fields)
+    @api.marshal_with(badge_fields)
     @api.secure(admin_permission)
     def post(self, dataset):
         '''Create a new badge for a given dataset'''

udata/core/dataset/api_fields.py

@@ -1,5 +1,5 @@
 from udata.api import api, fields, base_reference
-from udata.core.badges.api import badge_fields
+from udata.core.badges.fields import badge_fields
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.organization.constants import BIGGEST_LOGO_SIZE
 from udata.core.spatial.api_fields import spatial_coverage_fields

udata/core/organization/api.py

@@ -7,6 +7,7 @@ from udata.api import api, API, errors
 from udata.api.parsers import ModelApiParser
 from udata.auth import admin_permission, current_user
 from udata.core.badges import api as badges_api
+from udata.core.badges.fields import badge_fields
 from udata.core.followers.api import FollowAPI
 from udata.utils import multi_to_dict
 from udata.rdf import (
@@ -191,8 +192,8 @@ class AvailableOrganizationBadgesAPI(API):
 @ns.route('/<org:org>/badges/', endpoint='organization_badges')
 class OrganizationBadgesAPI(API):
     @api.doc('add_organization_badge', **common_doc)
-    @api.expect(badges_api.badge_fields)
-    @api.marshal_with(badges_api.badge_fields)
+    @api.expect(badge_fields)
+    @api.marshal_with(badge_fields)
     @api.secure(admin_permission)
     def post(self, org):
         '''Create a new badge for a given organization'''

udata/core/organization/api_fields.py

@@ -1,5 +1,5 @@
 from udata.api import api, fields, base_reference
-from udata.core.badges.api import badge_fields
+from udata.core.badges.fields import badge_fields
 
 from .constants import ORG_ROLES, DEFAULT_ROLE, MEMBERSHIP_STATUS, BIGGEST_LOGO_SIZE
 

udata/core/reuse/api.py

@@ -10,6 +10,7 @@ from udata.models import Dataset
 from udata.utils import id_or_404
 
 from udata.core.badges import api as badges_api
+from udata.core.badges.fields import badge_fields
 from udata.core.dataset.api_fields import dataset_ref_fields
 from udata.core.followers.api import FollowAPI
 from udata.core.storages.api import (
@@ -189,8 +190,8 @@ class AvailableDatasetBadgesAPI(API):
 @ns.route('/<reuse:reuse>/badges/', endpoint='reuse_badges')
 class ReuseBadgesAPI(API):
     @api.doc('add_reuse_badge', **common_doc)
-    @api.expect(badges_api.badge_fields)
-    @api.marshal_with(badges_api.badge_fields)
+    @api.expect(badge_fields)
+    @api.marshal_with(badge_fields)
     @api.secure(admin_permission)
     def post(self, reuse):
         '''Create a new badge for a given reuse'''

udata/core/reuse/api_fields.py

@@ -1,6 +1,6 @@
 from udata.api import api, fields, base_reference
 
-from udata.core.badges.api import badge_fields
+from udata.core.badges.fields import badge_fields
 from udata.core.dataset.api_fields import dataset_fields
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.user.api_fields import user_ref_fields

{udata-7.0.7.dev28493.dist-info → udata-7.0.7.dev28563.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.7.dev28493
+Version: 7.0.7.dev28563
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -28,7 +28,6 @@ Requires-Dist: attrs ==21.2.0
 Requires-Dist: authlib ==0.14.3
 Requires-Dist: awesome-slugify ==1.6.5
 Requires-Dist: babel ==2.12.1
-Requires-Dist: bcrypt ==3.1.7
 Requires-Dist: billiard ==3.6.4.0
 Requires-Dist: bleach ==3.1.0
 Requires-Dist: blinker ==1.4
@@ -78,7 +77,6 @@ Requires-Dist: lxml ==4.4.2
 Requires-Dist: markupsafe ==2.1.2
 Requires-Dist: mistune ==0.8.4
 Requires-Dist: mongoengine ==0.27.0
-Requires-Dist: msgpack ==0.6.2
 Requires-Dist: netaddr ==0.7.19
 Requires-Dist: passlib ==1.7.4
 Requires-Dist: pillow ==9.2.0
@@ -94,15 +92,12 @@ Requires-Dist: redis ==3.3.11
 Requires-Dist: regex ==2021.8.3
 Requires-Dist: requests ==2.24.0
 Requires-Dist: s3transfer ==0.6.0
-Requires-Dist: simplejson ==3.17.0
 Requires-Dist: six ==1.16.0
 Requires-Dist: speaklater ==1.3
 Requires-Dist: stringdist ==1.0.9
 Requires-Dist: text-unidecode ==1.3
 Requires-Dist: tlds ==2021080800
 Requires-Dist: typing-extensions ==4.7.1
-Requires-Dist: ujson ==1.35
-Requires-Dist: unicodecsv ==0.14.1
 Requires-Dist: unidecode ==0.4.21
 Requires-Dist: uritools ==3.0.2
 Requires-Dist: urlextract ==0.14.0
@@ -113,7 +108,6 @@ Requires-Dist: webencodings ==0.5.1
 Requires-Dist: werkzeug ==2.2.2
 Requires-Dist: wtforms[email] ==3.0.1
 Requires-Dist: wtforms-json ==0.3.5
-Requires-Dist: xmltodict ==0.12.0
 Requires-Dist: zipp ==3.12.1
 
 <p align="center"><img src="https://i.imgur.com/rlRox1c.png"></p>
@@ -143,6 +137,8 @@ It is collectively taken care of by members of the
 - Topic: add filters in API [#3007](https://github.com/opendatateam/udata/pull/3007)
 - Move constants outside `models.py` files to `constants.py` [#3001](https://github.com/opendatateam/udata/pull/3001)
 - Move `db` and Mongo fields classes outside `udata.models` [#3005](https://github.com/opendatateam/udata/pull/3005)
+- Remove unused dependencies [#3006](https://github.com/opendatateam/udata/pull/3006)
+- Move `badge_fields` to separate module than `models.py` [#3011](https://github.com/opendatateam/udata/pull/3011)
 
 ## 7.0.6 (2024-03-29)
 

{udata-7.0.7.dev28493.dist-info → udata-7.0.7.dev28563.dist-info}/RECORD

@@ -58,9 +58,10 @@ udata/core/activity/models.py,sha256=kzy9kcixX3DUo-2YpVjGXVHR4cOZMl7AsPiDBZ52EDs
 udata/core/activity/signals.py,sha256=nplrZFDDuGVXwLWpI_Lhe64mBRMRtwooJG1KcCH6Ses,191
 udata/core/activity/tasks.py,sha256=yKkDgBXYmVX-DS4P9hBgZcweEOU8mlihSj7pqQYOmkg,1242
 udata/core/badges/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/badges/api.py,sha256=BVHULesVK3godViXVOFSjGPCLYmHqLXXywsf0EaJpr8,993
+udata/core/badges/api.py,sha256=GVScMxwSerB8J_oo7yQEoxrCaR9roBmDQW3HJ_JAqbg,762
 udata/core/badges/commands.py,sha256=NMihQH6ABUlkYpR2lNFW4dkeaWOjpijW7voudww8zW4,1129
 udata/core/badges/factories.py,sha256=rDQC28fKLtYA6l69EqiyOQyN4C2jVj87EdKBEo4sYsw,297
+udata/core/badges/fields.py,sha256=rpeyZcw5-oU8FZXPnzU9-rGrwW5vCyhwgei7aAR-n3I,255
 udata/core/badges/forms.py,sha256=8z28_rln9duvJ7IvKx9IFO9DAMe3cU2bv0FQRdiMFEw,511
 udata/core/badges/models.py,sha256=cQBpLudR-cRxlbN68z_05UbX0BXRu97n1vMMdat4Ry4,3176
 udata/core/badges/permissions.py,sha256=5jFKFG4OlVp0pL0xSa7AGO0Ttn0QMsy9xEY2jTfKVmE,552
@@ -78,8 +79,8 @@ udata/core/contact_point/models.py,sha256=iwXsJgmsRiLWOaUbSqZe7Oyjcr6W6zhGwrmVzo
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=3pzBg_qOR-w7fwPpTOKUHXWC9lkjALbOn1UQFmmT-s0,1199
 udata/core/dataset/activities.py,sha256=qQnHNL0hOB1IGtQl7JsnVOiUsWT0gm-pts9uDyR3bvU,1536
-udata/core/dataset/api.py,sha256=Z9tjQbttNXQseKl6Fa4yQRptpu_kLh_kit04DOINfx8,28761
-udata/core/dataset/api_fields.py,sha256=B8yfwc1r5-jH35b9upKd5xkYanaLccxKm8aGfjtd3LY,15402
+udata/core/dataset/api.py,sha256=C6EGhJswCb2hHfKigbxFQbfzpzgvWm8VD3c4O-ZQFso,28789
+udata/core/dataset/api_fields.py,sha256=Cgd_BPlAhP0nTzocOZWWEM-LvKcgCxYE2x00oAiKFYM,15405
 udata/core/dataset/apiv2.py,sha256=XzEwtmC53Mw0mq8NEMCD2cN52pCmrUkPu0adUj4wGyw,15751
 udata/core/dataset/commands.py,sha256=dbK7gMYH4G6pOPiYtmL3yomzg5MGqTaG97_UM9Smu_k,3712
 udata/core/dataset/constants.py,sha256=Twml-I5mGiIdTkiDV1D4bXqi_TcNhcEc-QFxorUKHM4,3138
@@ -127,8 +128,8 @@ udata/core/metrics/signals.py,sha256=Xs_k-9lWzsoZU5Joli-41FNgvIVvbAejkjSFB6DHxh0
 udata/core/metrics/tasks.py,sha256=Z7La3-zPB5j6qJoPKr_MgjNZhqscZCmNLPa711ZBkdY,797
 udata/core/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/organization/activities.py,sha256=fOBujmduVoTxJph2C6Z4qHeQHOaJT9IsZooEDCWC4BA,1140
-udata/core/organization/api.py,sha256=kqcjsus3Mnso5dxnMACYIDWhSuXBTCVgYctFa7rhgT8,17451
-udata/core/organization/api_fields.py,sha256=5NEePyZ515DqpDVHf1HWQJhUXsb8H74LVywlAC5_I44,5400
+udata/core/organization/api.py,sha256=K9Lnps_gxxt_z1ImLZDBnY1eeh6Zpl7x50YoXcPzJ_k,17479
+udata/core/organization/api_fields.py,sha256=UV3DE7DoWvrRs2k-VnuJ2c7-mMTt93eVX8o-K_9IvXQ,5403
 udata/core/organization/apiv2.py,sha256=VAU_y9Zz-VhBgS-LWVbGOEZdSt3b44nZd5bzTV2wU8g,3206
 udata/core/organization/commands.py,sha256=FaSYxyWfQDR5tWvrAXmwcF2VMREOC13XTK8DD4vp_sY,1623
 udata/core/organization/constants.py,sha256=XGVnItrJTG0hcVKRK5sPmx44KHC9r_EKtj_y0MmBt0o,563
@@ -154,8 +155,8 @@ udata/core/post/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 udata/core/post/tests/test_api.py,sha256=LSJQQDUtUVdpwZNpnJaX3yNQYyjkjTTyO7mHnR5DR_I,3948
 udata/core/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/reuse/activities.py,sha256=rdl_CR3RJPBMonsHYmPnPVDvCYozNdXN2H1ILrTItNQ,1417
-udata/core/reuse/api.py,sha256=5z5tH7debD_rMmineB-fQ-lNKpZySA5u7TL7dd5hlag,10209
-udata/core/reuse/api_fields.py,sha256=NF0bSKWepyNzzKtG2MibflZrqNwf1FPtNqjpbTSAONY,4868
+udata/core/reuse/api.py,sha256=72oJxmwziqvuFhxcuXy-5ckhQo39t65hp4eqvSqbQ6o,10237
+udata/core/reuse/api_fields.py,sha256=aU5L7-jzywSZlO4cq2DfvvYmfmGMWcBimp959AVV3Zg,4871
 udata/core/reuse/apiv2.py,sha256=Op4f6pSMdUuLcCwNadojJfHfU6UYohrzSxlJbRn3wHc,824
 udata/core/reuse/constants.py,sha256=pbCR1xX9v4tdewlOx8bgNmy1-5V9OXIbpNjJivnQ--A,1215
 udata/core/reuse/csv.py,sha256=k-syWGC7hJnqfaOtPRFFn8P8skCDcrnMWNWbJ3fUyXo,727
@@ -674,9 +675,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=zCVMB-a4-mLM1jNyYMk58rgVRaVIwQ
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=avfWczvlLBKSohyB55-4TLmUGMU_Rze4XmAo4OTk2v0,43513
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=ScuqdpaV4y1ZIpBAEfxeaKdzkyGZL0mJmKMoG6w0iRQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=QpgEXh1eHjztPa7oNLXd_sds1DC95A-STTtZyTE4m-E,50093
-udata-7.0.7.dev28493.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.7.dev28493.dist-info/METADATA,sha256=KUcN6lCZ0N3FZ-bF6svhg7q0-HEZqoDUZPMcG9bKFu4,120887
-udata-7.0.7.dev28493.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.7.dev28493.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-7.0.7.dev28493.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.7.dev28493.dist-info/RECORD,,
+udata-7.0.7.dev28563.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.7.dev28563.dist-info/METADATA,sha256=KZHUTI9jdBeFx_oUfJDWme-H3_yqJicZlHsk7M57Hm8,120895
+udata-7.0.7.dev28563.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.7.dev28563.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-7.0.7.dev28563.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.7.dev28563.dist-info/RECORD,,