Skip to content
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.

Sign up for GitHub

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

minor changes to compare refdata pipeline #1578

Merged
merged 2 commits into from
May 20, 2021
Merged

minor changes to compare refdata pipeline #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d3a486
move bokeh step
epassaro May 20, 2021
835f0e7
use exact python version
epassaro May 20, 2021
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
10 changes: 5 additions & 5 deletions azure-pipelines/compare-refdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ jobs:
fetchRefdata: false # See the comment below.
useMamba: true

- bash: |
source activate tardis
$(package.manager) install bokeh=2.2 --channel conda-forge --no-update-deps --yes
displayName: 'Install Bokeh'

# Azure Repos requires token auth for public repositories containing LFS objects (bug).
# Fetch reference data from Azure with a PAT until a fix arrives.
- bash: |
Expand All @@ -64,11 +69,6 @@ jobs:
displayName: 'Generate reference data'
condition: or(eq(variables['ref1.hash'], ''), eq(variables['ref2.hash'], ''))

- bash: |
source activate tardis
$(package.manager) install bokeh=2.2 --channel conda-forge --no-update-deps --yes
displayName: 'Install Bokeh'

- bash: |
cd $(refdata.dir)/notebooks
source activate tardis
Expand Down
4 changes: 2 additions & 2 deletions tardis/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
logging.getLogger("py.warnings").addHandler(console_handler)

# ----------------------------------------------------------------------------
# pyne holds Python 3.7 on macOS, but refdata is pickled with protocol 5 (3.8)
# pyne holds Python 3.7 on macOS, but refdata is pickled with protocol 5 (3.8.3)

if sys.version_info < (3, 8):
if sys.version_info < (3, 8, 3):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@epassaro, oh, I think this check is not needed at all. pickle5 is only available on < 3.8 through conda, the whole tardis environment now resolves to Python 3.7 after #1566 because of this (macOS AND Linux).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The data is already pickled with 3.8, so yes, we need this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm missing something, can you point at the workflow with Python 3.8, please?

import pickle5

sys.modules["pickle"] = pickle5