From 192e3f91eba55684375bfd1ff49b6aec9c9597fb Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Wed, 21 Apr 2021 20:58:01 +0200 Subject: [PATCH 1/3] updated GPU dependencies --- README.md | 1 + docs/source/dependencies.rst | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index aa72d976..0f7501f0 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ Note that none of these are required for running on a CPU. * [CuPy](https://cupy.dev/) * [Torch](https://pytorch.org/) +* [TensorFlow](https://www.tensorflow.org/) ## Citation diff --git a/docs/source/dependencies.rst b/docs/source/dependencies.rst index 782807f8..2a513158 100644 --- a/docs/source/dependencies.rst +++ b/docs/source/dependencies.rst @@ -82,6 +82,7 @@ For GPU compliance the following packages can also be installed: * |link-to-cupy| * |link-to-torch| +* |link-to-tf| .. |link-to-cupy| raw:: html @@ -93,6 +94,11 @@ For GPU compliance the following packages can also be installed: Torch +.. |link-to-tf| raw:: html + + TensorFlow + .. note:: Note that none of these are required for running on a CPU. From 23b93823a186488c300a351719794098dabbb76c Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Wed, 21 Apr 2021 21:11:19 +0200 Subject: [PATCH 2/3] added logo to manifest --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 9a2f374e..74db0634 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,3 +3,4 @@ include develop.txt include docs/requirements.txt include README.rst include LICENSE.txt +include docs/source/modopt_logo.png From 364b8827028d3165771f311ca74a47d46197226e Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Wed, 21 Apr 2021 21:56:23 +0200 Subject: [PATCH 3/3] updated package version and release date --- docs/source/index.rst | 4 ++-- setup.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 8262d43d..238aa5b6 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -12,8 +12,8 @@ ModOpt Documentation .. include:: toc.rst :Author: Samuel Farrens `(samuel.farrens@cea.fr) `_ -:Version: 1.5.0 -:Release Date: 31/03/2021 +:Version: 1.5.1 +:Release Date: 22/04/2021 :Repository: |link-to-repo| .. |link-to-repo| raw:: html diff --git a/setup.py b/setup.py index 92040f6d..841ca1b1 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ # Set the package release version major = 1 minor = 5 -patch = 0 +patch = 1 # Set the package details name = 'modopt' @@ -29,9 +29,10 @@ os_str = 'Operating System :: {0}' classifiers = ( - [lc_str.format(license)] + [ln_str] + - [py_str.format(ver) for ver in python_versions_supported] + - [os_str.format(ops) for ops in os_platforms_supported] + [lc_str.format(license)] + + [ln_str] + + [py_str.format(ver) for ver in python_versions_supported] + + [os_str.format(ops) for ops in os_platforms_supported] ) # Source package description from README.md