diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 011d87f..82d20ef 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,10 @@ Change Log ========== +[1.4.1] - 2024-08-04 +-------------------- +- [ADDED] Numpy 2 compatibility + [1.4.0] - 2024-03-29 -------------------- - [ADDED] Official support for Python 3.12. diff --git a/CITATION.cff b/CITATION.cff index 69d79cf..8750fcb 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -5,7 +5,7 @@ authors: given-names: Felix M. orcid: https://orcid.org/0000-0003-0596-9585 title: "SuSi: SUpervised Self-organIzing maps in Python" -version: 1.4.0 +version: 1.4.1 doi: "10.5281/zenodo.2609130" date-released: 2021-12-11 repository-code: https://github.com/felixriese/susi diff --git a/dev-requirements.txt b/dev-requirements.txt index 4c66554..b69354a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,5 +2,5 @@ -r docs/requirements.txt -r test-requirements.txt -mypy==1.9.0 -pre-commit==3.6.2 +mypy==1.11.1 +pre-commit==3.8.0 diff --git a/docs/conf.py b/docs/conf.py index 18a8051..bb89184 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -27,7 +27,7 @@ # The short X.Y version version = "" # The full version, including alpha/beta/rc tags -release = "1.4.0" +release = "1.4.1" # -- General configuration --------------------------------------------------- diff --git a/guide/package.json b/guide/package.json index 3e9810b..3397d47 100755 --- a/guide/package.json +++ b/guide/package.json @@ -1,6 +1,6 @@ { "name": "susi-self-organizing-maps-with-python", - "version": "1.4.0", + "version": "1.4.1", "description": "Susi is a Python package for unsupervised, supervised and semi-supervised self-organizing maps (SOM).", "main": "index.js", "authors": { diff --git a/meta.yaml b/meta.yaml index e2107f3..5abf79c 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,5 +1,5 @@ {% set name = "susi" %} -{% set version = "1.4.0" %} +{% set version = "1.4.1" %} package: diff --git a/requirements.txt b/requirements.txt index 635d551..da04e5c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ numpy>=1.18.5 scikit-learn>=0.21.1 scipy>=1.3.1 tqdm>=4.45.0 -matplotlib==3.7.2 +matplotlib>=3.9.0 # for the examples notebook>=6.0.0 diff --git a/setup.py b/setup.py index 9c5dec8..61ce1a8 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setuptools.setup( name="susi", - version="1.4.0", + version="1.4.1", author="Felix M. Riese", author_email="github@felixriese.de", description=( diff --git a/susi/SOMClassifier.py b/susi/SOMClassifier.py index 503fe21..bab4165 100644 --- a/susi/SOMClassifier.py +++ b/susi/SOMClassifier.py @@ -276,7 +276,7 @@ def _set_placeholder(self) -> None: self.placeholder_ = self.placeholder_dict_["str"] elif self.class_dtype_ in [int, np.uint8, np.int64]: self.placeholder_ = self.placeholder_dict_["int"] - elif self.class_dtype_ in [float, np.float_, np.float64]: + elif self.class_dtype_ in [float, np.float64]: self.placeholder_ = self.placeholder_dict_["float"] else: raise ValueError( diff --git a/susi/SOMPlots.py b/susi/SOMPlots.py index a6022f8..d93f9e7 100644 --- a/susi/SOMPlots.py +++ b/susi/SOMPlots.py @@ -122,10 +122,7 @@ def plot_som_histogram( ax.set_xlabel("SOM columns", fontsize=fontsize) ax.set_ylabel("SOM rows", fontsize=fontsize) - for tick in ax.xaxis.get_major_ticks(): - tick.label.set_fontsize(fontsize) - for tick in ax.yaxis.get_major_ticks(): - tick.label.set_fontsize(fontsize) + ax.tick_params(labelsize=fontsize) # to be compatible with plt.imshow: ax.invert_yaxis() @@ -172,10 +169,7 @@ def plot_umatrix( ax.set_yticklabels(np.arange(0, n_rows + 1, 10)) # ticks and labels - for tick in ax.xaxis.get_major_ticks(): - tick.label.set_fontsize(fontsize) - for tick in ax.yaxis.get_major_ticks(): - tick.label.set_fontsize(fontsize) + ax.tick_params(labelsize=fontsize) ax.set_ylabel("SOM rows", fontsize=fontsize) ax.set_xlabel("SOM columns", fontsize=fontsize) diff --git a/susi/__init__.py b/susi/__init__.py index 35708a2..3def76d 100644 --- a/susi/__init__.py +++ b/susi/__init__.py @@ -5,7 +5,7 @@ """ -__version__ = "1.4.0" +__version__ = "1.4.1" from .SOMClassifier import SOMClassifier from .SOMClustering import SOMClustering diff --git a/test-requirements.txt b/test-requirements.txt index cb892ae..88f1bc5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,9 +1,9 @@ -black==24.3.0 +black==24.8.0 codecov>=2.1.13 -coverage>=7.4.4 -flake8==7.0.0 +coverage>=7.6.0 +flake8==7.1.0 isort==5.13.2 nbval>=0.11.0 -pytest>=8.1.1 +pytest>=8.3.2 pytest-cov>=4.1.0 pytest_mock==3.14.0