Fix tests (#1248)

serhii73 · Gallaecio · web-flow · commit 36a563462f70 · 2025-02-03T11:35:21.000+01:00
* Fix tests

* Fix the TestLocalTZOffset test

* Setup tests for minimum deps

* Run pre-commit

---------

Co-authored-by: Adrián Chaves &lt;adrian@chaves.io&gt;
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
@@ -21,7 +21,7 @@ jobs:
         fuzz-seconds: 600
         output-sarif: true
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,42 +14,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: 3.9
-            env:
-              TOXENV: flake8
-          - python-version: 3.9
-            env:
-              TOXENV: py
-          - python-version: "3.10"
-            env:
-              TOXENV: py
+          - python-version: "3.13"
+            toxenv: pre-commit
+          - python-version: "3.9"
+            toxenv: min
+          - python-version: "3.9"
+            toxenv: min-all
+          - python-version: "3.9"
           - python-version: "3.10"
-            env:
-              TOXENV: latest
-          - python-version: "3.11"
-            env:
-              TOXENV: py
           - python-version: "3.11"
-            env:
-              TOXENV: latest
           - python-version: "3.12"
-            env:
-              TOXENV: py
-          - python-version: "3.12"
-            env:
-              TOXENV: latest
-          - python-version: "3.13"
-            env:
-              TOXENV: py
           - python-version: "3.13"
-            env:
-              TOXENV: latest
+            toxenv: all
           - python-version: "3.13"
-            env:
-              TOXENV: twinecheck
+            toxenv: scripts
           - python-version: "3.12"  # Keep in sync with tox.ini
-            env:
-              TOXENV: docs
+            toxenv: docs
+          - python-version: "3.13"
+            toxenv: twinecheck
     steps:
       - uses: actions/checkout@v3
       - name: 'Set up Python ${{ matrix.python-version }}'
@@ -63,13 +45,6 @@ jobs:
           python -m pip install --upgrade pip
           pip install tox
       - name: Run tests
-        run: tox -e ${{ matrix.env.TOXENV }}
+        run: tox -e ${{ matrix.toxenv || 'py' }}
       - name: Upload coverage.xml to codecov
-        if: ${{ matrix.env.python-version == '3.9' && matrix.env.TOXENV == 'latest' }}
-        uses: codecov/codecov-action@v3
-
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: pre-commit/action@v3.0.0
+        uses: codecov/codecov-action@v4.0.1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,15 +1,7 @@
 repos:
-- repo: https://github.com/PyCQA/flake8
-  rev: 6.0.0  # 6.0.0 drops Python 3.7 support
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.9.3
   hooks:
-  - id: flake8
-    args: ['--config=.flake8']
-- repo: https://github.com/psf/black.git
-  rev: 23.3.0
-  hooks:
-  - id: black
-    exclude: ^dateparser/data/date_translation_data/
-- repo: https://github.com/pycqa/isort
-  rev: 5.12.0  # 5.12 drops Python 3.7 support
-  hooks:
-  - id: isort
+    - id: ruff
+      args: [ --fix ]
+    - id: ruff-format
diff --git a/dateparser/calendars/jalali_parser.py b/dateparser/calendars/jalali_parser.py
@@ -1,6 +1,5 @@
 import re
 from collections import OrderedDict
-from datetime import datetime
 from functools import reduce
 
 from convertdate import persian
diff --git a/dateparser/data/__init__.py b/dateparser/data/__init__.py
@@ -1,3 +1,2 @@
 from dateparser.data import date_translation_data
-
-from .languages_info import language_locale_dict, language_order
+from .languages_info import language_order, language_locale_dict
diff --git a/dateparser/date.py b/dateparser/date.py
@@ -1,5 +1,4 @@
 import collections
-import sys
 from collections.abc import Set
 from datetime import datetime, timedelta
 
diff --git a/dateparser/freshness_date_parser.py b/dateparser/freshness_date_parser.py
@@ -31,7 +31,7 @@ def _parse_time(self, date_string, settings):
         date_string = re.sub(r"\b(?:ago|in)\b", "", date_string)
         try:
             return time_parser(date_string)
-        except:
+        except Exception:
             pass
 
     def get_local_tz(self):
diff --git a/dateparser/parser.py b/dateparser/parser.py
@@ -182,7 +182,7 @@ def _find_best_matching_date(cls, datestring):
                 dt = strptime(datestring, fmt), cls._get_period(fmt)
                 if len(str(dt[0].year)) == 4:
                     return dt
-            except:
+            except Exception:
                 pass
         return None
 
@@ -216,7 +216,7 @@ def parse(cls, datestring, settings):
                     missing = _get_missing_parts(fmt)
                     _check_strict_parsing(missing, settings)
                     return dt
-                except:
+                except Exception:
                     pass
         else:
             if ambiguous_date:
@@ -332,7 +332,7 @@ def __init__(self, tokens, settings):
                     token.index(":")
                     # Is after period? raise ValueError if '.' can't be found:
                     self.tokens[self.tokens.index((token, 0)) + 1][0].index(".")
-                except:
+                except Exception:
                     microsecond = None
 
                 if microsecond:
@@ -342,7 +342,7 @@ def __init__(self, tokens, settings):
                     meridian = MERIDIAN.search(
                         self.filtered_tokens[meridian_index][0]
                     ).group()
-                except:
+                except Exception:
                     meridian = None
 
                 if any([":" in token, meridian, microsecond]):
@@ -514,9 +514,9 @@ def _correct_for_time_frame(self, dateobj, tz):
 
         # NOTE: If this assert fires, self.now needs to be made offset-aware in a similar
         # way that dateobj is temporarily made offset-aware.
-        assert not (
-            self.now.tzinfo is None and dateobj.tzinfo is not None
-        ), "`self.now` doesn't have `tzinfo`. Review comment in code for details."
+        assert not (self.now.tzinfo is None and dateobj.tzinfo is not None), (
+            "`self.now` doesn't have `tzinfo`. Review comment in code for details."
+        )
 
         # Store the original dateobj values so that upon subsequent parsing everything is not
         # treated as offset-aware if offset awareness is changed.
@@ -686,7 +686,7 @@ def parse_alpha(token, skip_component=None):
                                 (component, getattr(do, component)),
                                 ("day", prev_value),
                             ]
-                    except:
+                    except Exception:
                         pass
             else:
                 raise ValueError("Unable to parse: %s" % token)
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,6 +13,8 @@
 import os
 import sys
 
+import dateparser
+
 # Get the project root dir, which is the parent dir of this
 cwd = os.getcwd()
 project_root = os.path.dirname(cwd)
@@ -22,8 +24,6 @@
 # version is used.
 sys.path.insert(0, project_root)
 
-import dateparser
-
 # -- General configuration ---------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
diff --git a/fuzzing/requirements.txt b/fuzzing/requirements.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,6 @@
+[tool.ruff]
+exclude = ["date_translation_data"]
+
+[tool.ruff.lint.per-file-ignores]
+"dateparser/data/__init__.py" = ["F401"]
+"dateparser/languages/__init__.py" = ["F401"]
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
@@ -15,8 +15,6 @@
     r":mod:|:class:|:func:", "", open("HISTORY.rst", encoding="utf-8").read()
 )
 
-test_requirements = open("tests/requirements.txt").read().splitlines()
-
 setup(
     name="dateparser",
     version=__version__,
@@ -31,19 +29,18 @@
     packages=find_packages(exclude=("tests", "tests.*")),
     include_package_data=True,
     install_requires=[
-        "python-dateutil",
-        "pytz",
-        # https://bitbucket.org/mrabarnett/mrab-regex/issues/314/import-error-no-module-named
-        "regex !=2019.02.19,!=2021.8.27",
-        "tzlocal",
+        "python-dateutil>=2.7.0",
+        "pytz>=2024.2",
+        "regex>=2015.06.24,!=2019.02.19,!=2021.8.27",
+        "tzlocal>=0.2",
     ],
     entry_points={
         "console_scripts": ["dateparser-download = dateparser_cli.cli:entrance"],
     },
     extras_require={
-        "calendars": ["hijridate", "convertdate"],
-        "fasttext": ["fasttext"],
-        "langdetect": ["langdetect"],
+        "calendars": ["convertdate>=2.2.1", "hijridate"],
+        "fasttext": ["fasttext>=0.9.1", "numpy>=1.19.3,<2"],
+        "langdetect": ["langdetect>=1.0.0"],
     },
     license="BSD",
     zip_safe=False,
diff --git a/tests/requirements.txt b/tests/requirements.txt
diff --git a/tests/test_clean_api.py b/tests/test_clean_api.py
@@ -119,7 +119,7 @@ def test_dates_which_match_locales_are_parsed(
                 languages=["en"],
                 region="",
                 date_formats=["%a", "%a", "%a", "%a"],
-                expected_date=datetime(1969, 1, 31, 14, 4),
+                expected_date=datetime(1969, 1, 31, 13, 4),
             )
         ]
     )
diff --git a/tests/test_date.py b/tests/test_date.py
@@ -81,7 +81,7 @@ def test_should_reject_easily_mistaken_dateutil_arguments(self, invalid_period):
         self.when_date_range_generated(
             begin=datetime(2014, 6, 15),
             end=datetime(2014, 6, 25),
-            **{invalid_period: 1}
+            **{invalid_period: 1},
         )
         self.then_period_was_rejected(invalid_period)
 
diff --git a/tests/test_date_parser.py b/tests/test_date_parser.py
@@ -198,9 +198,7 @@ def setUp(self):
             param("[সেপ্টেম্বর] 04, 2014.", datetime(2014, 9, 4)),
             param("মঙ্গলবার জুলাই 22, 2014", datetime(2014, 7, 22)),
             param("শুক্রবার", datetime(2012, 11, 9)),
-            param(
-                "শুক্র, 12 ডিসেম্বর 2014 10:55:50", datetime(2014, 12, 12, 10, 55, 50)
-            ),
+            param("শুক্র, 12 ডিসেম্বর 2014 10:55:50", datetime(2014, 12, 12, 10, 55, 50)),
             param("1লা জানুয়ারী 2015", datetime(2015, 1, 1)),
             param("25শে মার্চ 1971", datetime(1971, 3, 25)),
             param("8ই মে 2002", datetime(2002, 5, 8)),
@@ -418,9 +416,7 @@ def test_stringified_datetime_should_parse_fine(self):
             param("[সেপ্টেম্বর] 04, 2014.", datetime(2014, 9, 4)),
             param("মঙ্গলবার জুলাই 22, 2014", datetime(2014, 7, 22)),
             param("শুক্রবার", datetime(2012, 11, 9)),
-            param(
-                "শুক্র, 12 ডিসেম্বর 2014 10:55:50", datetime(2014, 12, 12, 10, 55, 50)
-            ),
+            param("শুক্র, 12 ডিসেম্বর 2014 10:55:50", datetime(2014, 12, 12, 10, 55, 50)),
             param("1লা জানুয়ারী 2015", datetime(2015, 1, 1)),
             param("25শে মার্চ 1971", datetime(1971, 3, 25)),
             param("8ই মে 2002", datetime(2002, 5, 8)),
diff --git a/tests/test_dateparser_data_integrity.py b/tests/test_dateparser_data_integrity.py
@@ -1,3 +1,7 @@
+import pytest
+
+pytest.importorskip("ruamel")
+
 from dateparser_scripts.write_complete_data import write_complete_data
 
 
diff --git a/tests/test_hijri.py b/tests/test_hijri.py
@@ -1,5 +1,7 @@
-import sys
-import unittest
+import pytest
+
+pytest.importorskip("hijridate")
+
 from datetime import datetime
 
 from parameterized import param, parameterized
diff --git a/tests/test_jalali.py b/tests/test_jalali.py
@@ -1,3 +1,7 @@
+import pytest
+
+pytest.importorskip("convertdate")
+
 from datetime import datetime
 
 from parameterized import param, parameterized
diff --git a/tests/test_language_detect.py b/tests/test_language_detect.py
@@ -1,3 +1,7 @@
+import pytest
+
+pytest.importorskip("fasttext")
+
 import unittest
 from datetime import datetime
 from unittest.mock import Mock
diff --git a/tests/test_languages.py b/tests/test_languages.py
diff --git a/tests/test_search.py b/tests/test_search.py
diff --git a/tests/test_timezone_parser.py b/tests/test_timezone_parser.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import collections`
`2`		`-import sys`
`3`	`2`	`from collections.abc import Set`
`4`	`3`	`from datetime import datetime, timedelta`
`5`	`4`