Merge remote-tracking branch 'origin/dev' into sqlalchemy-2.0

funilrys · Apr 29, 2023 · bb1fbc6 · bb1fbc6
2 parents 204f2c8 + f2d0e15
commit bb1fbc6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/PyFunceble/.vscode/settings.json b/PyFunceble/.vscode/settings.json
diff --git a/PyFunceble/cli/entry_points/pyfunceble/argsparser.py b/PyFunceble/cli/entry_points/pyfunceble/argsparser.py
@@ -51,7 +51,7 @@
 """
 
 import argparse
-from typing import Optional, Sequence, Text
+from typing import Optional, Sequence
 
 # pylint: disable=raising-bad-type
 
@@ -63,7 +63,7 @@ class OurArgumentParser(argparse.ArgumentParser):
 
     def parse_args(
         self,
-        args: Optional[Sequence[Text]] = None,
+        args: Optional[Sequence[str]] = None,
         namespace: Optional[argparse.Namespace] = None,
     ) -> argparse.Namespace:
         namespace = super().parse_args(args, namespace)

diff --git a/requirements.txt b/requirements.txt
@@ -2,14 +2,14 @@ alembic
 colorama
 cryptography>=3.3.2
 dnspython[DOH]~=2.0.0
-domain2idna>=1.12.0
+domain2idna~=1.12.0
 inflection
 packaging
 PyMySQL
 python-box[all]~=6.0.0
 python-dotenv
 PyYAML
 requests[socks]<3
-setuptools
+setuptools>=65.5.1
 shtab
 SQLAlchemy~=2.0
diff --git a/requirements.win.txt b/requirements.win.txt
@@ -10,7 +10,6 @@ python-box[all]~=6.0.0
 python-dotenv
 PyYAML
 requests<3
-setuptools
+setuptools>=65.5.1
 shtab
 SQLAlchemy~=1.4
-psycopg2