Skip to content

Commit

Permalink
update licensing and fixing py3.8 again
Browse files Browse the repository at this point in the history
  • Loading branch information
cokelaer committed Oct 17, 2024
1 parent a6f070d commit 6955fda
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 17 deletions.
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
BSD 3-Clause License

Copyright (c) 2014, Thomas Cokelaer
All rights reserved.

Expand Down
14 changes: 11 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
5 changes: 2 additions & 3 deletions src/colormap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
#
# File author(s): Thomas Cokelaer <[email protected]>
#
# 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
Expand Down
5 changes: 2 additions & 3 deletions src/colormap/colors.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
#
# File author(s): Thomas Cokelaer <[email protected]>
#
# 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
Expand Down
7 changes: 2 additions & 5 deletions src/colormap/get_cmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@
#
# File author(s): Thomas Cokelaer <[email protected]>
#
# 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
Expand Down
5 changes: 2 additions & 3 deletions src/colormap/xfree86.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
#
# File author(s): Thomas Cokelaer <[email protected]>
#
# 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
Expand Down

0 comments on commit 6955fda

Please sign in to comment.