Skip to content

Commit

Permalink
Merge pull request #7809 from ThomasWaldmann/move-to-pyprojecttoml-ma…
Browse files Browse the repository at this point in the history
…ster

Move to pyproject.toml
  • Loading branch information
ThomasWaldmann committed Sep 5, 2023
2 parents 5cce0d7 + 55f0798 commit 0ac750d
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 99 deletions.
78 changes: 78 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,57 @@
[project]
name = "borgbackup"
dynamic = ["version"]
authors = [{name="The Borg Collective (see AUTHORS file)"}]
maintainers = [
{name="Thomas Waldmann", email="tw@waldmann-edv.de"},
]
description = "Deduplicated, encrypted, authenticated and compressed backups"
readme = "README.rst"
requires-python = ">=3.9"
keywords = ["backup", "borgbackup"]
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Console",
"Intended Audience :: System Administrators",
"License :: OSI Approved :: BSD License",
"Operating System :: POSIX :: BSD :: FreeBSD",
"Operating System :: POSIX :: BSD :: OpenBSD",
"Operating System :: POSIX :: BSD :: NetBSD",
"Operating System :: MacOS :: MacOS X",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Security :: Cryptography",
"Topic :: System :: Archiving :: Backup",
]
license = {text="BSD"}
dependencies = [
"msgpack >=1.0.3, <=1.0.5",
"packaging",
"platformdirs >=3.0.0, <4.0.0; sys_platform == 'darwin'", # for macOS: breaking changes in 3.0.0,
"platformdirs >=2.6.0, <4.0.0; sys_platform != 'darwin'", # for others: 2.6+ works consistently.
"argon2-cffi",
]

[project.optional-dependencies]
llfuse = ["llfuse >= 1.3.8"]
pyfuse3 = ["pyfuse3 >= 3.1.1"]
nofuse = []

[project.urls]
"Homepage" = "https://borgbackup.org/"
"Bug Tracker" = "https://github.com/borgbackup/borg/issues"
"Documentation" = "https://borgbackup.readthedocs.io/"
"Repository" = "https://github.com/borgbackup/borg"
"Changelog" = "https://github.com/borgbackup/borg/blob/master/docs/changes.rst"

[project.scripts]
borg = "borg.archiver:main"
borgfs = "borg.archiver:main"

[build-system]
requires = ["setuptools", "pkgconfig", "Cython", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta"
Expand Down Expand Up @@ -67,3 +121,27 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
"src/borg/testsuite/archiver/return_codes.py" = ["F811"]
"src/borg/testsuite/benchmark.py" = ["F811"]
"src/borg/testsuite/platform.py" = ["F811"]

[tool.pytest.ini_options]
python_files = "testsuite/*.py"
markers = [
"allow_cache_wipe",
]

[tool.mypy]
python_version = "3.9"
strict_optional = false
local_partial_types = true
show_error_codes = true
files = "src/borg/**/*.py"

[[tool.mypy.overrides]]
module = [
"msgpack.*",
"llfuse",
"pyfuse3",
"trio",
"borg.crypto.low_level",
"borg.platform.*",
]
ignore_missing_imports = true
96 changes: 0 additions & 96 deletions setup.cfg

This file was deleted.

4 changes: 2 additions & 2 deletions src/borg/helpers/msgpack.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def __init__(
use_single_float=False,
autoreset=True,
use_bin_type=USE_BIN_TYPE,
strict_types=False
strict_types=False,
):
assert unicode_errors == UNICODE_ERRORS
super().__init__(
Expand Down Expand Up @@ -133,7 +133,7 @@ def __init__(
unicode_errors=UNICODE_ERRORS,
max_buffer_size=0,
ext_hook=ExtType,
strict_map_key=False
strict_map_key=False,
):
assert raw == RAW
assert unicode_errors == UNICODE_ERRORS
Expand Down
2 changes: 1 addition & 1 deletion src/borg/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def list(
older=None,
newer=None,
oldest=None,
newest=None
newest=None,
):
"""
Return list of ArchiveInfo instances according to the parameters.
Expand Down

0 comments on commit 0ac750d

Please sign in to comment.