From 2d3a4867800ca1e0ce5ac88121be6257908ef73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20P=C3=A1ssaro?= Date: Thu, 20 May 2021 13:28:07 -0300 Subject: [PATCH 1/2] move bokeh step --- azure-pipelines/compare-refdata.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines/compare-refdata.yml b/azure-pipelines/compare-refdata.yml index 2bdfadfa78b..7aff852d562 100644 --- a/azure-pipelines/compare-refdata.yml +++ b/azure-pipelines/compare-refdata.yml @@ -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: | @@ -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 From 835f0e7482d33a994b1edcaf7cbd26babadd7a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20P=C3=A1ssaro?= Date: Thu, 20 May 2021 13:28:21 -0300 Subject: [PATCH 2/2] use exact python version --- tardis/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tardis/__init__.py b/tardis/__init__.py index 757f47cf236..7db1fb432e1 100644 --- a/tardis/__init__.py +++ b/tardis/__init__.py @@ -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): import pickle5 sys.modules["pickle"] = pickle5