From 6955fda1ae3322ba94cdfde16ba12a1aee6cdb71 Mon Sep 17 00:00:00 2001 From: Thomas Cokelaer Date: Thu, 17 Oct 2024 13:20:19 +0200 Subject: [PATCH] update licensing and fixing py3.8 again --- LICENSE | 2 ++ pyproject.toml | 14 +++++++++++--- src/colormap/__init__.py | 5 ++--- src/colormap/colors.py | 5 ++--- src/colormap/get_cmap.py | 7 ++----- src/colormap/xfree86.py | 5 ++--- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 0d09cf4..e486119 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +BSD 3-Clause License + Copyright (c) 2014, Thomas Cokelaer All rights reserved. diff --git a/pyproject.toml b/pyproject.toml index c595a0a..91221b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,9 +37,17 @@ Documentation = "https://colormap.readthedocs.io" [tool.poetry.dependencies] -python = "^3.8" -matplotlib = "^3" - +# to keep python3.8, we need this convoluated pins on matplotlbi and numpy +# python 3.8 and python3.12 are quite afar wrt numpy installation. +python = "^3.8,<4" +matplotlib = [ + {version = "^3.9.2", python ="^3.12"}, + {version = "^3", python ="<3.12"}, +] +numpy = [ + {version = "^2", python ="^3.9"}, + {version = "<2,", python ="<3.9"} +] [tool.poetry.group.dev.dependencies] diff --git a/src/colormap/__init__.py b/src/colormap/__init__.py index 51c0d3e..0a0b2bc 100644 --- a/src/colormap/__init__.py +++ b/src/colormap/__init__.py @@ -7,9 +7,8 @@ # # File author(s): Thomas Cokelaer # -# Distributed under the GPLv3 License. -# See accompanying file LICENSE.txt or copy at -# http://www.gnu.org/licenses/gpl-3.0.html +# Distributed under the terms of the 3-clause BSD license. +# The full license is in the LICENSE file, distributed with this software. # # Website: https://www.github.com/cokelaer/colormap # Documentation: http://packages.python.org/colormap diff --git a/src/colormap/colors.py b/src/colormap/colors.py index 7ca5268..ea78ee4 100644 --- a/src/colormap/colors.py +++ b/src/colormap/colors.py @@ -7,9 +7,8 @@ # # File author(s): Thomas Cokelaer # -# Distributed under the GPLv3 License. -# See accompanying file LICENSE.txt or copy at -# http://www.gnu.org/licenses/gpl-3.0.html +# Distributed under the terms of the 3-clause BSD license. +# The full license is in the LICENSE file, distributed with this software. # # Website: https://github.com/cokelaer/colormap # Documentation: http://packages.python.org/colormap diff --git a/src/colormap/get_cmap.py b/src/colormap/get_cmap.py index 83f6502..42595b1 100644 --- a/src/colormap/get_cmap.py +++ b/src/colormap/get_cmap.py @@ -6,11 +6,8 @@ # # File author(s): Thomas Cokelaer # -# Distributed under the GPLv3 License. -# See accompanying file LICENSE.txt or copy at -# http://www.gnu.org/licenses/gpl-3.0.html -# -# website: +# Distributed under the terms of the 3-clause BSD license. +# The full license is in the LICENSE file, distributed with this software. # ############################################################################## from colormap import Colormap diff --git a/src/colormap/xfree86.py b/src/colormap/xfree86.py index 1ba1340..e361c16 100644 --- a/src/colormap/xfree86.py +++ b/src/colormap/xfree86.py @@ -7,9 +7,8 @@ # # File author(s): Thomas Cokelaer # -# Distributed under the GPLv3 License. -# See accompanying file LICENSE.txt or copy at -# http://www.gnu.org/licenses/gpl-3.0.html +# Distributed under the terms of the 3-clause BSD license. +# The full license is in the LICENSE file, distributed with this software. # # Website: https://www.github.com/cokelaer/colormap # Documentation: http://packages.python.org/colormap