Merge branch 'main' into Replace-pkg_resources-with-import-importlib.resources

Author: georgkrause

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"]
 
     steps:
       - uses: actions/checkout@v4
@@ -25,25 +25,3 @@ jobs:
           name: junit-${{ matrix.python-version }}
           path: junit/*
 
-  report:
-    runs-on: ubuntu-latest
-    needs: test
-    permissions: 
-      pull-requests: write
-    steps:
-      - uses: actions/download-artifact@v4
-      - name: Publish Test Reports
-        uses: EnricoMi/publish-unit-test-result-action/composite@v2
-        if: always()
-        with:
-          files: junit-*/test-results-*.xml
-      - name: Create Coverage Report
-        uses: irongut/CodeCoverageSummary@v1.3.0
-        with:
-          filename: junit-*/coverage-*.xml
-          format: markdown
-          output: both
-      - name: Add coverage PR comment
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          path: code-coverage-results.md

.github/workflows/test-report.yml

@@ -0,0 +1,31 @@
+name: 'Test Report'
+on: 
+  workflow_run:
+    workflows: ['Continous Integration']
+    types:
+      - completed
+permissions:
+  contents: read
+  actions: read
+  checks: write
+  pull-requests: write
+jobs:
+  report:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+      - name: Publish Test Reports
+        uses: EnricoMi/publish-unit-test-result-action/composite@v2
+        if: always()
+        with:
+          files: junit-*/test-results-*.xml
+      - name: Create Coverage Report
+        uses: irongut/CodeCoverageSummary@v1.3.0
+        with:
+          filename: junit-*/coverage-*.xml
+          format: markdown
+          output: both
+      - name: Add coverage PR comment
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          path: code-coverage-results.md

langcodes/__init__.py

@@ -1501,7 +1501,7 @@ def __eq__(self, other):
         return self._str_tag == other._str_tag
 
     def __hash__(self) -> int:
-        return hash(id(self))
+        return hash(self._str_tag)
 
     def __getitem__(self, key: str) -> Optional[Union[str, List[str]]]:
         if key in self.ATTRIBUTES:

langcodes/tests/test_language.py

@@ -0,0 +1,16 @@
+from langcodes import Language
+
+
+def test__hash__():
+    en1 = Language.get("en")
+    # Disable caching
+    Language._INSTANCES = {}
+    Language._PARSE_CACHE = {}
+    en2 = Language.get("en")
+    assert hash(en1) == hash(en2)
+
+    # Again, disable caching
+    Language._INSTANCES = {}
+    Language._PARSE_CACHE = {}
+    en_us = Language.get("en-US")
+    assert hash(en1) != hash(en_us)