Merge branch 'main' into performance-enhancements

Author: ahankinson

.github/workflows/coverage_readme.yml

@@ -59,10 +59,9 @@ jobs:
         run: |
           sed -i '/<!-- Pytest Coverage Comment:Begin -->/,/<!-- Pytest Coverage Comment:End -->/c\<!-- Pytest Coverage Comment:Begin -->\n\${{ steps.coverageComment.outputs.coverageHtml }}\n<!-- Pytest Coverage Comment:End -->' ./README.md
 
-      - name: Commit & Push changes to README
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add README.md
-          git commit -m 'Update coverage badge in README'
-          git push
+      - name: Commit & Push changes to Readme
+        if: ${{ github.ref == 'refs/heads/main' }}
+        uses: actions-js/push@master
+        with:
+          message: Update coverage on Readme
+          github_token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,14 +1,12 @@
 # python-edtf
 
 <!-- Pytest Coverage Comment:Begin -->
-<!-- Pytest Coverage Comment:End -->
+\n<!-- Pytest Coverage Comment:End -->
 
 An implementation of EDTF format in Python, together with utility functions for parsing natural language date texts, and converting EDTF dates to related Python `date` or `struct_time` objects.
 
 See <http://www.loc.gov/standards/datetime/> for the final draft specification.
 
-This project is based on python-edtf and was developed to include the newest specification
-
 ## To install
 
 ```shell

dev-requirements.txt

@@ -2,6 +2,7 @@
 django>=4.2,<5.0
 pytest
 pytest-benchmark
+pytest-cov
 pytest-django
 ruff
 pre-commit

edtf/parser/parser_classes.py

@@ -874,6 +874,7 @@ def __init__(  # noqa
 
         uas = [
             year_ua,
+            year_ua_b,
             month_ua,
             day_ua,
             year_month_ua,
@@ -902,7 +903,10 @@ def __str__(self) -> str:
         else:
             y = f"{self.year_ua_b}{self.year}" if self.year_ua_b else str(self.year)
 
-        m = f"{self.month_ua}{self.month}" if self.month_ua else str(self.month)
+        if self.month:
+            m = f"{self.month_ua}{self.month}" if self.month_ua else str(self.month)
+        else:
+            m = None
 
         if self.day:
             d = f"{self.day_ua}{self.day}" if self.day_ua else str(self.day)
@@ -918,7 +922,12 @@ def __str__(self) -> str:
             else:
                 result = f"{y}-({m}-{d}){self.month_day_ua}"
         else:
-            result = f"{y}-{m}-{d}" if d else f"{y}-{m}"
+            if d:
+                result = f"{y}-{m}-{d}"
+            elif m:
+                result = f"{y}-{m}"
+            else:
+                result = y
 
         if self.all_ua:
             result = f"({result}){self.all_ua}"

edtf/parser/tests.py

@@ -257,6 +257,18 @@
     ("2011-~06-~04", (False, True, False)),
     ("2004-06-~01/2004-06-~20", (False, True, False)),
     ("156X~", (False, True, False)),
+    ("?1945/1959", (True, False, False)),
+    ("?1945", (True, False, False)),
+    ("?1945-01", (True, False, False)),
+    ("?1945-01-01", (True, False, False)),
+    ("~1945/1959", (False, True, False)),
+    ("~1945", (False, True, False)),
+    ("~1945-01", (False, True, False)),
+    ("~1945-01-01", (False, True, False)),
+    ("%1945/1959", (False, False, True)),
+    ("%1945", (False, False, True)),
+    ("%1945-01", (False, False, True)),
+    ("%1945-01-01", (False, False, True)),
 )
 
 BAD_EXAMPLES = (

pyproject.toml

@@ -36,6 +36,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 [project.optional-dependencies]
@@ -147,4 +148,6 @@ ignore = [
     "E501",
     # Ignore McCabe complexity (for now).
     "C901",
+    # Ignore percent format -> format specifier rule for now (pending merge of #73 which resolves them)
+    "UP031",
 ]