From 14f53f6659c512ae9bd7e7bcb3d919c9e0438402 Mon Sep 17 00:00:00 2001 From: Jan Ittner Date: Mon, 25 Apr 2022 12:02:57 +0200 Subject: [PATCH 1/6] BUILD: update version to 1.2.3 --- src/facet/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/facet/__init__.py b/src/facet/__init__.py index bd4480df..3eaa4db3 100644 --- a/src/facet/__init__.py +++ b/src/facet/__init__.py @@ -6,7 +6,7 @@ """ -__version__ = "1.2.2" +__version__ = "1.2.3" __logo__ = ( r""" From db25eacd0f45315760757f5a2573687d7dd2d148 Mon Sep 17 00:00:00 2001 From: j-ittner Date: Tue, 27 Sep 2022 13:39:40 +0200 Subject: [PATCH 2/6] BUILD: pin scipy to < 1.9 due to an incompatibility with scikit-learn --- environment.yml | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index e567406a..84f6d109 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - pandas ~= 1.4 - python ~= 3.8 - scikit-learn ~= 0.24.2 - - scipy ~= 1.6 + - scipy ~= 1.8.1 - shap ~= 0.39.0 - sklearndf ~= 1.2 # build/test diff --git a/pyproject.toml b/pyproject.toml index a11ecad7..bda6433c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ requires = [ "numpy >=1.17,<2a", "packaging >=20", "pandas >=0.24,<2a", - "scipy ~=1.2", + "scipy ~=1.2,<1.9a", "shap >=0.34,<0.40a", "sklearndf ~=1.2", ] @@ -98,7 +98,7 @@ numpy = ">=1.22,<2a" packaging = ">=20.9" pandas = "~=1.4" python = "~=3.8" -scipy = "~=1.5" +scipy = "~=1.8.1" shap = "~=0.39.0" sklearndf = "~=1.2" # additional maximum requirements of sklearndf From 97a13a92df907a1771af6c10a5a8fe41b2058d61 Mon Sep 17 00:00:00 2001 From: j-ittner Date: Tue, 27 Sep 2022 15:00:24 +0200 Subject: [PATCH 3/6] BUILD: pin matplotlib to < 3.6 due to an incompatibility with pytools --- environment.yml | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 84f6d109..0d08b262 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: - gamma-pytools ~= 1.2, >= 1.2.1 - joblib ~= 1.1 - lightgbm ~= 3.2 - - matplotlib ~= 3.3 + - matplotlib ~= 3.5.2 - numpy ~= 1.22 - pandas ~= 1.4 - python ~= 3.8 diff --git a/pyproject.toml b/pyproject.toml index bda6433c..ab020ed4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ license = "Apache Software License v2.0" requires = [ # direct requirements of gamma-facet "gamma-pytools ~=1.2,>=1.2.1", - "matplotlib ~=3.0", + "matplotlib ~=3.0,<3.6a", "numpy >=1.17,<2a", "packaging >=20", "pandas >=0.24,<2a", @@ -93,7 +93,7 @@ typing-extensions = "<4.2" [build.matrix.max] # direct requirements of gamma-facet gamma-pytools = "~=1.2,>=1.2.1" -matplotlib = "~=3.4" +matplotlib = "~=3.5.2" numpy = ">=1.22,<2a" packaging = ">=20.9" pandas = "~=1.4" From 4a4361f9943ecd32b5eee1f42f1532a3ceadfdd3 Mon Sep 17 00:00:00 2001 From: j-ittner Date: Tue, 27 Sep 2022 15:16:14 +0200 Subject: [PATCH 4/6] BUILD: run nightly builds on branch 2.0.x --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2f36dca8..0a0d5639 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ schedules: displayName: Nightly full build branches: include: - - 1.2.x + - 2.0.x resources: repositories: From 5f6bf9e8a6e4a2efab2bd832b88e00b7b1db63df Mon Sep 17 00:00:00 2001 From: j-ittner Date: Thu, 29 Sep 2022 16:32:07 +0200 Subject: [PATCH 5/6] DOC: disable doc build --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0a0d5639..9b858e01 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -565,14 +565,20 @@ stages: variables: - group: github_ssh + # Doc build has been disabled since the documentation format has changed from + # version 2.0.0 onwards. + # The new documentation format is not compatible with the old doc build process. jobs: - job: displayName: 'Build and publish docs' condition: > + and( + false, or( eq(variables.source_is_release_branch, 'True'), eq(variables.source_is_develop_branch, 'True') ) + ) pool: From 2bf1e720139791302562226f0692e5fa6ae2de50 Mon Sep 17 00:00:00 2001 From: j-ittner Date: Thu, 29 Sep 2022 16:34:42 +0200 Subject: [PATCH 6/6] DOC: update release notes --- RELEASE_NOTES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 2c5acd86..2f7fe40d 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -10,6 +10,12 @@ fit the underlying crossfit. One example where this can be useful is to use only a recent period of a time series as the baseline of a simulation. +1.2.3 +~~~~~ + +- BUILD: pin down *matplotlib* version to < 3.6 and *scipy* version to < 1.9 to ensure + compatibility with *pytools* 1.2 and *sklearndf* 1.2 + 1.2.2 ~~~~~