From 91d38dc9f4be96f94042cc64a28ceeae91d37513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 31 Dec 2021 11:31:11 +0100 Subject: [PATCH 1/4] update ersion and change doc build --- .circleci/config.yml | 3 --- ot/__init__.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6abba7837..62ac31b8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -173,8 +173,5 @@ workflows: requires: - build_docs filters: - branches: - only: - - master tags: only: /[0-9]+(\.[0-9]+)*$/ \ No newline at end of file diff --git a/ot/__init__.py b/ot/__init__.py index e436571b3..1ea740332 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -50,7 +50,7 @@ # utils functions from .utils import dist, unif, tic, toc, toq -__version__ = "0.8.1" +__version__ = "0.8.2dev" __all__ = ['emd', 'emd2', 'emd_1d', 'sinkhorn', 'sinkhorn2', 'utils', 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov', From eb3e5745586aed73011b65b93d1b743dd141bbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 31 Dec 2021 11:40:38 +0100 Subject: [PATCH 2/4] update release file --- RELEASES.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 2a45465f6..8495fcefa 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,6 +1,16 @@ # Releases +## 0.8.2 +*December 2021* + +This is a bug fix release that will remove the `benchmark` module form the +installation and correct the documentation generation. + +#### Closed issues + +- Bug in documentation generation (tag VS master push, PR #332) + ## 0.8.1 *December 2021* From 59c0d6b6306aa6f39221a7e0194b8626156e3ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 31 Dec 2021 11:56:13 +0100 Subject: [PATCH 3/4] debug release of doc --- .circleci/config.yml | 7 ++++++- RELEASES.md | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62ac31b8a..f5cb7564c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,7 +161,10 @@ workflows: default: jobs: - - build_docs + - build_docs: + filters: + tags: + only: /[0-9]+(\.[0-9]+)*$/ - deploy_master: requires: - build_docs @@ -173,5 +176,7 @@ workflows: requires: - build_docs filters: + branches: + ignore: /.*/ tags: only: /[0-9]+(\.[0-9]+)*$/ \ No newline at end of file diff --git a/RELEASES.md b/RELEASES.md index 8495fcefa..9e98cbdc7 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -10,6 +10,8 @@ installation and correct the documentation generation. #### Closed issues - Bug in documentation generation (tag VS master push, PR #332) +- Remove installation of the benchmarks in global namespace (Issue #331, PR #333) + ## 0.8.1 *December 2021* From 772733445f9db52790fa4bf4a195dbc5e14ec94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 31 Dec 2021 12:02:16 +0100 Subject: [PATCH 4/4] set version number to 0.8.1.0 --- RELEASES.md | 4 ++-- ot/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 9e98cbdc7..00af0fb18 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,10 +1,10 @@ # Releases -## 0.8.2 +## 0.8.1.0 *December 2021* -This is a bug fix release that will remove the `benchmark` module form the +This is a bug fix release that will remove the `benchmarks` module form the installation and correct the documentation generation. #### Closed issues diff --git a/ot/__init__.py b/ot/__init__.py index 1ea740332..f55819d6f 100644 --- a/ot/__init__.py +++ b/ot/__init__.py @@ -50,7 +50,7 @@ # utils functions from .utils import dist, unif, tic, toc, toq -__version__ = "0.8.2dev" +__version__ = "0.8.1.0" __all__ = ['emd', 'emd2', 'emd_1d', 'sinkhorn', 'sinkhorn2', 'utils', 'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov',