From 471d41d1f8e424a342a8959871e09ec206c04673 Mon Sep 17 00:00:00 2001
From: "Dr. Felix M. Riese" <mail@felixriese.de>
Date: Sat, 11 Dec 2021 15:12:23 +0100
Subject: [PATCH] ADD official support for Python 3.10 (#28)

* ADD official support for Python 3.10
* CHANGE version number for release 1.2.2
---
 .github/workflows/tests_and_linting.yml | 3 ++-
 CHANGELOG.rst                           | 6 ++++++
 CITATION.cff                            | 4 ++--
 docs/conf.py                            | 2 +-
 meta.yaml                               | 6 +++---
 requirements.txt                        | 2 +-
 setup.py                                | 6 +++---
 susi/__init__.py                        | 2 +-
 8 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tests_and_linting.yml b/.github/workflows/tests_and_linting.yml
index 5d29354..37dcaad 100644
--- a/.github/workflows/tests_and_linting.yml
+++ b/.github/workflows/tests_and_linting.yml
@@ -15,7 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        # Python versions need to be strings (otherwise: 3.10 -> 3.1)
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e82afa1..18ab27c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+[1.2.2] - 2021-12-11
+--------------------
+- [ADDED] Official support for Python 3.10.
+- [REMOVED] Official support for Python 3.6 (will be deprecated end of 2021
+  anyways). It might still work, but will not be maintained on this version.
+
 [1.2.1] - 2021-10-19
 --------------------
 - [ADDED] Quantization error `get_quantization_error()`
diff --git a/CITATION.cff b/CITATION.cff
index 589d1d2..8164f40 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -5,9 +5,9 @@ authors:
     given-names: Felix M.
     orcid: https://orcid.org/0000-0003-0596-9585
 title: "SuSi: SUpervised Self-organIzing maps in Python"
-version: 1.2.1
+version: 1.2.2
 doi: "10.5281/zenodo.2609130"
-date-released: 2021-10-19
+date-released: 2021-12-11
 repository-code: https://github.com/felixriese/susi
 license: BSD-3-Clause
 preferred-citation:
diff --git a/docs/conf.py b/docs/conf.py
index 70b06f8..b3bc994 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.2.1"
+release = "1.2.2"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/meta.yaml b/meta.yaml
index 344081e..fb7547a 100644
--- a/meta.yaml
+++ b/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "susi" %}
-{% set version = "1.2.1" %}
+{% set version = "1.2.2" %}
 
 
 package:
@@ -18,11 +18,11 @@ build:
 requirements:
   host:
     - pip
-    - python >=3.6
+    - python >=3.7
   run:
     - joblib >=0.13.0
     - numpy >=1.18.5
-    - python >=3.6
+    - python >=3.7
     - scikit-learn >=0.21.1
     - scipy >=1.3.1
     - tqdm >=4.45.0
diff --git a/requirements.txt b/requirements.txt
index cb2a8c2..8536356 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ nbval>=0.9.5
 coverage>=5.3
 
 # for formatting
-black
+black>=21.9b0
 
 # for the documentation
 sphinx>=3.3.0
diff --git a/setup.py b/setup.py
index 71284a8..6e22661 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 
 setuptools.setup(
     name="susi",
-    version="1.2.1",
+    version="1.2.2",
     author="Felix M. Riese",
     author_email="github@felixriese.de",
     description=(
@@ -42,10 +42,10 @@
     packages=setuptools.find_packages(),
     classifiers=[
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Environment :: Console",
         "Intended Audience :: Developers",
         "Intended Audience :: Education",
@@ -61,5 +61,5 @@
         "Source": "https://github.com/felixriese/susi",
         "Tracker": "https://github.com/felixriese/susi/issues",
     },
-    python_requires=">=3.6",
+    python_requires=">=3.7",
 )
diff --git a/susi/__init__.py b/susi/__init__.py
index e631fd2..2cbdab7 100644
--- a/susi/__init__.py
+++ b/susi/__init__.py
@@ -4,7 +4,7 @@
 self-organizing maps (SOM).
 
 """
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 from .SOMClassifier import SOMClassifier
 from .SOMClustering import SOMClustering