Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES/plugin_api/6079.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Removed the fallback for unserializable task return values.
Tasks resulting from an api action should use the corresponding serializer to produce useful output. Maintenance tasks should return nothing.
2 changes: 1 addition & 1 deletion pulp_certguard/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):

name = "pulp_certguard.app"
label = "certguard"
version = "3.96.0.dev"
version = "3.100.0.dev"
python_package_name = "pulpcore"
domain_compatible = True
2 changes: 1 addition & 1 deletion pulp_file/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):

name = "pulp_file.app"
label = "file"
version = "3.96.0.dev"
version = "3.100.0.dev"
python_package_name = "pulpcore"
domain_compatible = True
2 changes: 1 addition & 1 deletion pulpcore/app/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig):
label = "core"

# The version of this app
version = "3.96.0.dev"
version = "3.100.0.dev"

# The python package name providing this app
python_package_name = "pulpcore"
Expand Down
11 changes: 0 additions & 11 deletions pulpcore/app/models/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Django models related to the Tasking system
"""

import json
import logging
import traceback
from gettext import gettext as _
Expand Down Expand Up @@ -233,16 +232,6 @@ def set_completed(self, result=None):
This updates the :attr:`finished_at` and sets the :attr:`state` to :attr:`COMPLETED`.
If `result` is provided, the :attr:`result` contains the result of the task.
"""
try:
json.dumps(result, cls=DjangoJSONEncoder)
except (TypeError, ValueError):
deprecation_logger.warning(
_(
"The result of the {} function is not JSON-serializable and will be "
"replaced with None: {}. This will raise an error in version 3.100."
).format(self.name, result)
)
result = None

# Only set the state to finished if it's running. This is important for when the task has
# been canceled, so we don't move the task from canceled to finished.
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = "pulpcore"
version = "3.96.0.dev"
version = "3.100.0.dev"
description = "Pulp Django Application and Related Modules"
readme = "README.md"
authors = [
Expand Down Expand Up @@ -204,7 +204,7 @@ ignore = [
[tool.bumpversion]
# This section is managed by the plugin template. Do not edit manually.

current_version = "3.96.0.dev"
current_version = "3.100.0.dev"
commit = false
tag = false
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
Expand Down