-
-
Notifications
You must be signed in to change notification settings - Fork 152
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix TypeError: "Can't pickle objects in acquisition wrappers" (Calculation) #340
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
from Acquisition import aq_inner | ||
from Acquisition import aq_parent | ||
from bika.lims import logger | ||
from bika.lims.catalog import CATALOG_ANALYSIS_LISTING | ||
from bika.lims.config import PROJECTNAME as product | ||
from bika.lims.upgrade import upgradestep | ||
from bika.lims.upgrade.utils import UpgradeUtils | ||
|
||
version = '1.1.2' | ||
profile = 'profile-{0}:default'.format(product) | ||
|
||
|
||
@upgradestep(product, version) | ||
def upgrade(tool): | ||
portal = aq_parent(aq_inner(tool)) | ||
setup = portal.portal_setup | ||
ut = UpgradeUtils(portal) | ||
ver_from = ut.getInstalledVersion(product) | ||
|
||
if ut.isOlderVersion(product, version): | ||
logger.info("Skipping upgrade of {0}: {1} > {2}".format( | ||
product, ver_from, version)) | ||
# The currently installed version is more recent than the target | ||
# version of this upgradestep | ||
return True | ||
|
||
logger.info("Upgrading {0}: {1} -> {2}".format(product, ver_from, version)) | ||
|
||
# The assignment of the whole Calculation object in a metadata column | ||
# was causing a "TypeError: Can't pickle objects in acquisition wrappers". | ||
# getCalculation was only used in analyses listing and can be safely | ||
# replaced by getCalculationUID, cause is only used to determine if a | ||
# calculation is required to compute the result value | ||
# https://github.com/senaite/bika.lims/issues/322 | ||
ut.delColumn(CATALOG_ANALYSIS_LISTING, 'getCalculation') | ||
ut.addColumn(CATALOG_ANALYSIS_LISTING, 'getCalculationUID') | ||
ut.refreshCatalogs() | ||
|
||
logger.info("{0} upgraded to version {1}".format(product, version)) | ||
return True |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the jump directly to 1.1.2 and not 1.1.1?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I missed to set the metadata's version to 1.1.1 in my previous upgradestep :(