Skip to content

Commit f363788

Browse files
committed
pin down python to >=3.8
1 parent e77dc79 commit f363788

File tree

7 files changed

+24
-27
lines changed

7 files changed

+24
-27
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ jobs:
2323
with:
2424
python-version: ${{ matrix.python }}
2525

26-
27-
# Handle the numpy installation separately for Python 3.12
28-
- name: Install numpy for Python 3.12
29-
if: matrix.python == '3.12'
30-
run: |
31-
pip install --upgrade pip
32-
pip install setuptools wheel
33-
pip install --no-use-pep517 "numpy" --upgrade # Upgrade numpy version for 3.12
34-
35-
3626
- name: Install the package itself
3727
run: |
3828
pip install poetry

LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
BSD 3-Clause License
2+
13
Copyright (c) 2014, Thomas Cokelaer
24
All rights reserved.
35

pyproject.toml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,20 @@ Documentation = "https://colormap.readthedocs.io"
3737

3838

3939
[tool.poetry.dependencies]
40-
python = "^3.9"
41-
matplotlib = "^3"
42-
40+
# to keep python3.8, we need this convoluated pins on matplotlbi and numpy
41+
# python 3.8 and python3.12 are quite afar wrt numpy installation.
42+
python = "^3.8,<4"
43+
matplotlib = [
44+
{version = "^3.9.2", python ="^3.12"},
45+
{version = "^3", python ="<3.12"},
46+
]
47+
numpy = [
48+
{version = "^2", python ="^3.9"},
49+
{version = "<2,", python ="<3.9"}
50+
]
51+
importlib_resources = [
52+
{version = ">6", python=">=3.9,<=3.10"}
53+
]
4354

4455

4556
[tool.poetry.group.dev.dependencies]

src/colormap/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
#
88
# File author(s): Thomas Cokelaer <[email protected]>
99
#
10-
# Distributed under the GPLv3 License.
11-
# See accompanying file LICENSE.txt or copy at
12-
# http://www.gnu.org/licenses/gpl-3.0.html
10+
# Distributed under the terms of the 3-clause BSD license.
11+
# The full license is in the LICENSE file, distributed with this software.
1312
#
1413
# Website: https://www.github.com/cokelaer/colormap
1514
# Documentation: http://packages.python.org/colormap

src/colormap/colors.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
#
88
# File author(s): Thomas Cokelaer <[email protected]>
99
#
10-
# Distributed under the GPLv3 License.
11-
# See accompanying file LICENSE.txt or copy at
12-
# http://www.gnu.org/licenses/gpl-3.0.html
10+
# Distributed under the terms of the 3-clause BSD license.
11+
# The full license is in the LICENSE file, distributed with this software.
1312
#
1413
# Website: https://github.com/cokelaer/colormap
1514
# Documentation: http://packages.python.org/colormap

src/colormap/get_cmap.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66
#
77
# File author(s): Thomas Cokelaer <[email protected]>
88
#
9-
# Distributed under the GPLv3 License.
10-
# See accompanying file LICENSE.txt or copy at
11-
# http://www.gnu.org/licenses/gpl-3.0.html
12-
#
13-
# website:
9+
# Distributed under the terms of the 3-clause BSD license.
10+
# The full license is in the LICENSE file, distributed with this software.
1411
#
1512
##############################################################################
1613
from colormap import Colormap

src/colormap/xfree86.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
#
88
# File author(s): Thomas Cokelaer <[email protected]>
99
#
10-
# Distributed under the GPLv3 License.
11-
# See accompanying file LICENSE.txt or copy at
12-
# http://www.gnu.org/licenses/gpl-3.0.html
10+
# Distributed under the terms of the 3-clause BSD license.
11+
# The full license is in the LICENSE file, distributed with this software.
1312
#
1413
# Website: https://www.github.com/cokelaer/colormap
1514
# Documentation: http://packages.python.org/colormap

0 commit comments

Comments
 (0)