Remove Python 3.7, Add Python 3.13 and 3.14

cvzi · cvzi · commit d54b2f0efafa · 2025-09-20T22:23:50.000+02:00
* Update all dependencies
 * Remove any code that was specific to Python 3.7 and is no longer necessary
 * Fix some pyright lint issues in the test files
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -27,14 +27,17 @@ jobs:
       max-parallel: 4
       matrix:
         python-version:
+            - "3.8"
+            - "3.9"
             - "3.10"
             - "3.11"
             - "3.12"
-            - "3.13-dev"
+            - "3.13"
+            - "3.14-dev"
     steps:
 
     - name: Download pre-built packages
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: Packages
         path: dist
@@ -43,10 +46,18 @@ jobs:
     - name: Remove source code
       run: rm -R emoji
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install tox
+    - name: Install tox (for Python < 3.10)
+      if: ${{ !(startsWith(matrix.python-version, '3.8') || startsWith(matrix.python-version, '3.9')) }}
       run: python -Im pip install tox
-    - name: Run tox on wheel
-      run: python -Im tox run --installpkg dist/*.whl
+    - name: Run tox on wheel (for Python < 3.10)
+      if: ${{ !(startsWith(matrix.python-version, '3.8') || startsWith(matrix.python-version, '3.9')) }}
+      run: python -Im tox run --conf pyproject.toml --installpkg dist/*.whl
+    - name: Install wheel
+      run: python -Im pip install dist/*.whl
+    - name: Install pytest
+      run: python -Im pip install pytest
+    - name: Test with pytest (if tox not used)
+      run: python -Im pytest
diff --git a/.github/workflows/pypipublish.yml b/.github/workflows/pypipublish.yml
@@ -12,7 +12,7 @@ jobs:
       id-token: write
       attestations: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: hynek/build-and-inspect-python-package@v2
@@ -31,9 +31,9 @@ jobs:
       attestations: write
     steps:
       - name: Download package built by build-and-inspect-python-package
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: Packages
           path: dist
       - name: Upload package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.10.1
+        uses: pypa/gh-action-pypi-publish@v1.13.0
diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml
@@ -9,23 +9,23 @@ on:
       - 'gh-pages'
 jobs:
   pytest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       max-parallel: 8
       matrix:
         python-version:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "pypy-3.10"
           - "3.11"
           - "3.12"
-          - "3.13-dev"
+          - "3.13"
+          - "3.14-dev"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dev dependencies
@@ -42,12 +42,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.13-dev"]
+        python-version: ["3.13"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
diff --git a/.github/workflows/updateGithubPages.yml b/.github/workflows/updateGithubPages.yml
@@ -9,11 +9,11 @@ jobs:
   generateGHPages:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: '3.12'
+        python-version: '3.13'
     - name: Install package
       run: |
         python -m pip install --upgrade pip setuptools
diff --git a/docs/index.rst b/docs/index.rst
@@ -18,7 +18,7 @@ emoji
 
 Release v\ |version|. (:ref:`Installation <install>`)
 
-emoji supports Python 3.7+. The last version to support Python 2.7 and 3.5 was v2.4.0.
+emoji supports Python 3.8+. The last version to support Python 2.7 and 3.5 was v2.4.0.
 
 .. contents:: Table of Contents
 
diff --git a/emoji/core.py b/emoji/core.py
@@ -8,13 +8,7 @@
 
 import re
 import unicodedata
-import sys
-from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
-
-if sys.version_info < (3, 9):
-    from typing_extensions import Literal, Match, TypedDict  # type: ignore
-else:
-    from typing import Literal, Match, TypedDict
+from typing import Any, Callable, Dict, Iterator, List, Literal, Match, Optional, Tuple, TypedDict, Union
 
 from emoji import unicode_codes
 from emoji.tokenizer import (
diff --git a/emoji/unicode_codes/__init__.py b/emoji/unicode_codes/__init__.py
@@ -4,7 +4,7 @@
 from functools import lru_cache
 from warnings import warn
 
-from typing import Any, BinaryIO, Dict, Optional, Set
+from typing import IO, Any, Dict, Optional, Set
 
 from emoji.unicode_codes.data_dict import STATUS, LANGUAGES
 
@@ -76,7 +76,7 @@ def __missing__(self, key: str) -> str:
 EMOJI_DATA: Dict[str, Dict[str, Any]]
 
 
-def _open_file(name: str) -> BinaryIO:
+def _open_file(name: str) -> IO[bytes]:
     if sys.version_info >= (3, 9):
         return importlib.resources.files('emoji.unicode_codes').joinpath(name).open('rb')
     else:
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "emoji"
 description = "Emoji for Python"
 readme = "README.rst"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
     { name = "Taehoon Kim", email = "carpedm20@gmail.com" },
     { name = "Kevin Wurster", email = "wursterk@gmail.com" },
@@ -19,13 +19,13 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Python",
@@ -34,7 +34,6 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Typing :: Typed",
 ]
-dependencies = ["typing_extensions >= 4.7.0; python_version < '3.9'"]
 dynamic = ["version"]
 
 [project.urls]
@@ -58,7 +57,7 @@ pythonpath = [".", "utils"]
 testpaths = ["tests"]
 
 [tool.pyright]
-pythonVersion = "3.7"
+pythonVersion = "3.8"
 pythonPlatform = "All"
 typeCheckingMode = "strict"
 extraPaths = ["utils"]
@@ -90,7 +89,8 @@ ignore = ["Q000", "Q003"]
 [tool.tox]
 legacy_tox_ini = """
     [tox]
-    minversion = 4.15.0
+    minversion = 4.30.0
+
 
     [testenv]
     description = Run the tests with pytest
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -2,15 +2,12 @@
 
 import random
 import re
-import sys
 
-from typing import Any, Callable, Dict, List, Tuple, Union
-if sys.version_info < (3, 9):
-    from typing_extensions import Literal  # type: ignore
-else:
-    from typing import Literal
+from typing import Any, Callable, Dict, List, Literal, Tuple, Union
 import pytest
-import emoji.unicode_codes
+
+import emoji
+
 from testutils import (
     ascii,
     normalize,
diff --git a/tests/test_versions.py b/tests/test_versions.py
@@ -2,7 +2,7 @@
 
 from typing import Any, Dict, List
 import pytest
-import emoji.unicode_codes
+import emoji
 from testutils import all_language_packs
 
 
diff --git a/utils/README.md b/utils/README.md
@@ -56,7 +56,7 @@ languages = {
 If you run the script, the JSON files in the directory `emoji/unicode_codes/` are replaced with the new files.
 
 ```sh
-python -m pip install -r requirements.txt
+python -m pip install -r utils/requirements.txt
 python utils/generate_emoji.py
 python utils/generate_emoji_translations.py
 ```
diff --git a/utils/gh-pages/requirements.txt b/utils/gh-pages/requirements.txt
@@ -1,2 +1,2 @@
-django>=4.1.1
+django>=5.2.6
 django-htmlmin>=0.11.0
diff --git a/utils/requirements.txt b/utils/requirements.txt
@@ -1,3 +1,4 @@
-requests>=2.32.3
-beautifulsoup4>=4.12.3
+requests>=2.32.5
+beautifulsoup4>=4.13.5
 cloudscraper>=1.2.71
+urllib3>=2.5.0
diff --git a/utils/testutils.py b/utils/testutils.py
@@ -1,14 +1,9 @@
-from typing import Generator, Dict, Any, Tuple, Iterable
-import sys
+from typing import Generator, Dict, Any, Tuple, Iterable, Literal
 import unicodedata
 
 import pytest
-if sys.version_info < (3, 9):
-    from typing_extensions import Literal  # type: ignore
-else:
-    from typing import Literal
 
-import emoji.unicode_codes
+import emoji
 
 _NormalizationForm = Literal['NFC', 'NFD', 'NFKC', 'NFKD']
 
@@ -33,10 +28,7 @@ def normalize(form: _NormalizationForm, s: str) -> str:
 
 
 def is_normalized(form: _NormalizationForm, s: str) -> bool:
-    if sys.version_info >= (3, 8):
-        return unicodedata.is_normalized(form, s)
-    else:
-        return normalize(form, s) == s
+    return unicodedata.is_normalized(form, s)
 
 
 _EMOJI_UNICODE: Dict[str, Any] = {
