Merge branch 'nijel-chraset-normalizer'

otsaloma · May 28, 2024 · 7157344 · 7157344
2 parents dfd3196 + 236a7ca
commit 7157344
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+PENDING: Gaupol 1.15
+====================
+
+* Drop dependency on chardet
+* Add dependency on charset-normalizer
+* Raise Python dependency to >= 3.5
+
 2024-04-02: Gaupol 1.14.1
 =========================
 

diff --git a/README.aeidon.md b/README.aeidon.md
@@ -33,10 +33,10 @@ Note that the `--with-*` and `--without-*` are global options and must
 be placed before any commands.
 
 Of the dependencies listed in the [`README.md`](README.md) file,
-iso-codes and chardet are to be associated with aeidon. If aeidon is
-installed using the `--without-iso-codes` switch, then iso-codes is
-required instead of optional. gaupol should depend on the remaining
-dependencies as well as aeidon of the same version.
+iso-codes and charset-normalizer are to be associated with aeidon. If
+aeidon is installed using the `--without-iso-codes` switch, then
+iso-codes is required instead of optional. gaupol should depend on the
+remaining dependencies as well as aeidon of the same version.
 
 ## History
 

diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ and gettext to build the Flatpak.
 
 #### Source
 
-Gaupol requires Python ≥ 3.4, PyGObject ≥ 3.12 and GTK ≥ 3.12.
+Gaupol requires Python ≥ 3.5, PyGObject ≥ 3.12 and GTK ≥ 3.12.
 Additionally, during installation you need gettext. Optional, but
 strongly recommended dependencies include:
 
@@ -48,7 +48,7 @@ strongly recommended dependencies include:
 | [GStreamer](https://gstreamer.freedesktop.org/) | ≥ 1.6 | integrated video player |
 | [gspell](https://wiki.gnome.org/Projects/gspell) | ≥ 1.0.0 | spell-check |
 | [iso-codes](https://salsa.debian.org/iso-codes-team/iso-codes) | ≥ 3.67 | translations |
-| [chardet](https://github.com/chardet/chardet) | ≥ 2.2.1 | character encoding auto-detection |
+| [charset-normalizer](https://github.com/jawah/charset_normalizer) | | character encoding auto-detection |
 
 From GStreamer you need at least the core, gst-plugins-base,
 gst-plugins-good and gst-plugins-bad; and for good container and codec
@@ -69,7 +69,7 @@ command.
                      gstreamer1.0-plugins-ugly \
                      iso-codes \
                      python3 \
-                     python3-chardet \
+                     python3-charset-normalizer \
                      python3-dev \
                      python3-gi \
                      python3-gi-cairo

diff --git a/aeidon/util.py b/aeidon/util.py
@@ -210,7 +210,7 @@ def get_chardet_version():
     """Return :mod:`charset_normalizer` version number as string or ``None``."""
     try:
         import charset_normalizer
-        return "charset_normalizer {}".format(charset_normalizer.__version__)
+        return charset_normalizer.__version__
     except ImportError:
         return None
 

diff --git a/flatpak/io.otsaloma.gaupol.yml b/flatpak/io.otsaloma.gaupol.yml
@@ -41,16 +41,14 @@ modules:
 
   # Character encoding auto-detection
 
-  - name: chardet
+  - name: charset-normalizer
     buildsystem: simple
     build-commands:
-      - python3 setup.py install --prefix=/app
-    ensure-writable:
-      - /lib/python3.*/site-packages/easy-install.pth
+      - pip3 install --break-system-packages --verbose .
     sources:
       - type: archive
-        url: https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz
-        sha256: 84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae
+        url: https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8/charset-normalizer-3.3.2.tar.gz
+        sha256: f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5
 
   # External video player: mpv
 

diff --git a/gaupol/dialogs/debug.py b/gaupol/dialogs/debug.py
@@ -107,7 +107,7 @@ def _insert_dependencies(self):
         pygobject_version = dotjoin(GObject.pygobject_version)
         python_version = dotjoin(sys.version_info[:3])
         self._insert_text("aeidon: {}\n".format(aeidon.__version__))
-        self._insert_text("chardet: {}\n".format(chardet_version))
+        self._insert_text("charset-normalizer: {}\n".format(chardet_version))
         self._insert_text("gaupol: {}\n".format(gaupol.__version__))
         self._insert_text("gspell: {}\n".format(gspell_version))
         self._insert_text("gstreamer: {}\n".format(gst_version))