Merge 1b27d62578 into 8f197ea7e1

Without typo

locale/fr/LC_MESSAGES/core.po

@@ -183,7 +183,7 @@ msgstr "Contenu"
 
 #: core\pe\matchblock.py:66
 msgid "Analyzed %d/%d pictures"
-msgstr "Analyzé %d/%d images"
+msgstr "Analysé %d/%d images"
 
 #: core\pe\matchblock.py:183
 msgid "Performed %d/%d chunk matches"

pyproject.toml

@@ -1,86 +1,9 @@
 [build-system]
-requires = ["setuptools >= 75.3.1"]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
-
-[project]
-name = "dupeGuru"
-description = "dupeGuru is a tool to find duplicate files on your computer."
-authors = [
-    {name = "Andrew Senetar", email = "arsenetar@voltaicideas.net"}
-]
-readme = "README.md"
-license = "GPL-3.0-or-later"
-license-files = ["LICENSE"]
-keywords = ["deduplication"]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: End Users/Desktop",
-    "Operating System :: MacOS :: MacOS X",
-    "Operating System :: Microsoft :: Windows",
-    "Operating System :: POSIX",
-    "Programming Language :: Python :: 3 :: Only",
-    "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",
-    "Topic :: Desktop Environment :: File Managers",
-]
-requires-python = ">=3.7, <3.13"
-
-dynamic = ["version"]
-
-dependencies = [
-    "distro>=1.8.0,<2.0.0",
-    "mutagen>=1.46.0,<2.0.0",
-    "polib>=1.1.0,<2.0.0",
-    "PyQt5 >=5.15.0,<6.0; sys_platform != 'linux'",
-    "pywin32>=304; sys_platform == 'win32'",
-    "semantic-version>=2.0.0,<3.0.0",
-    "Send2Trash>=1.8.2",
-    "xxhash>=3.0.0,<4.0.0",
-]
-
-[project.optional-dependencies]
-dev = [
-    "pytest>=7,<8",
-    "flake8",
-    "black",
-]
-build = [
-    "dupeGuru[dev]",
-    "sphinx>=5.3.0,<8.0.0",
-    "pyinstaller>=5.6,<6.0; sys_platform != 'linux'"
-]
-
-[project.urls]
-Homepage = "https://dupeguru.voltaicideas.net/"
-Documentation = "https://dupeguru.voltaicideas.net/help/en/"
-Repository = "https://github.com/arsenetar/dupeguru.git"
-Issues = "https://github.com/arsenetar/dupeguru/issues"
-Releases = "https://github.com/arsenetar/dupeguru/releases"
-
-[project.gui-scripts]
-dupeguru = "dupeguru.__main__:main"
-
 [tool.black]
 line-length = 120
-
 [tool.isort]
 # make it compatible with black
 profile = "black"
 skip_gitignore = true
-
-[tool.setuptools.packages.find]
-include = ["core", "hscommon", "qt"]
-
-[tool.setuptools.dynamic]
-version = {attr = "core.__version__"}
-
-[tool.setuptools]
-ext-modules = [
-    {name = "core.pe._block", sources = ["core/pe/modules/block.c", "core/pe/modules/common.c"], include-dirs = ["core/pe/modules"]},
-    {name = "core.pe._cache", sources = ["core/pe/modules/cache.c", "core/pe/modules/common.c"], include-dirs = ["core/pe/modules"]},
-    {name = "qt.pe._block_qt", sources = ["qt/pe/modules/block.c"]},
-]

requirements-extra.txt

@@ -0,0 +1,4 @@
+pytest>=7,<8
+flake8
+black
+pyinstaller>=5.6,<6.0; sys_platform != 'linux'

requirements.txt

@@ -0,0 +1,9 @@
+distro>=1.8.0,<2.0.0
+mutagen>=1.46.0,<2.0.0
+polib>=1.1.0,<2.0.0
+PyQt5 >=5.15.0,<6.0; sys_platform != 'linux'
+pywin32>=304; sys_platform == 'win32'
+semantic-version>=2.0.0,<3.0.0
+Send2Trash>=1.8.2,<2.0.0
+sphinx>=5.3.0,<8.0.0
+xxhash>=3.0.0,<4.0.0

setup.cfg

@@ -0,0 +1,48 @@
+[metadata]
+name = dupeGuru
+version = attr: core.__version__
+url = https://github.com/arsenetar/dupeguru
+project_urls =
+    Bug Reports = https://github.com/arsenetar/dupeguru/issues
+author = Andrew Senetar
+author_email = arsenetar@voltaicideas.net
+license = GPLv3
+license_files = license
+description = dupeGuru is a tool to find duplicate files on your computer.
+long_description = file:README.md
+long_description_content_type = text/markdown
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: End Users/Desktop
+    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+    Operating System :: MacOS :: MacOS X
+    Operating System :: Microsoft :: Windows
+    Operating System :: POSIX
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3 :: Only
+    Topic :: Desktop Environment :: File Managers
+
+[options]
+packages = find:
+python_requires = >=3.7
+install_requires =
+    Send2Trash>=1.8.2,<2.0.0
+    mutagen>=1.46.0,<2.0.0
+    distro>=1.8.0,<2.0.0
+    PyQt5 >=5.15.0,<6.0; sys_platform != 'linux'
+    pywin32>=228; sys_platform == 'win32'
+    semantic-version>=2.0.0,<3.0.0
+    xxhash>=3.0.0,<4.0.0
+setup_requires =
+    sphinx>=3.0.0
+    polib>=1.1.0
+tests_require =
+    pytest >=6,<7
+include_package_data = true
+
+[options.entry_points]
+console_scripts =
+    dupeguru = run.py

setup.py

@@ -0,0 +1,26 @@
+from setuptools import setup, Extension
+from pathlib import Path
+
+exts = [
+    Extension(
+        "core.pe._block",
+        [
+            str(Path("core", "pe", "modules", "block.c")),
+            str(Path("core", "pe", "modules", "common.c")),
+        ],
+        include_dirs=[str(Path("core", "pe", "modules"))],
+    ),
+    Extension(
+        "core.pe._cache",
+        [
+            str(Path("core", "pe", "modules", "cache.c")),
+            str(Path("core", "pe", "modules", "common.c")),
+        ],
+        include_dirs=[str(Path("core", "pe", "modules"))],
+    ),
+    Extension("qt.pe._block_qt", [str(Path("qt", "pe", "modules", "block.c"))]),
+]
+
+headers = [str(Path("core", "pe", "modules", "common.h"))]
+
+setup(ext_modules=exts, headers=headers)