From 9642ace95324cb7800004afcd63a345116dfbfbb Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 7 Apr 2022 19:11:15 +0200 Subject: [PATCH 1/2] require/configure setuptools_scm via pyproject.toml --- pyproject.toml | 5 ++++- setup.cfg | 4 +--- setup.py | 3 --- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cda60db81..0ab3879e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ [build-system] -requires = ["setuptools", "pkgconfig", "Cython!=0.27"] +requires = ["setuptools", "pkgconfig", "Cython!=0.27", "setuptools_scm[toml]>=6.2"] build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] +write_to = "src/borg/_version.py" diff --git a/setup.cfg b/setup.cfg index 16886a7e2..00239aa8d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,8 +35,6 @@ packages = find: package_dir = =src python_requires = >=3.9 -setup_requires = - setuptools_scm>=1.7 install_requires = msgpack >=1.0.3, <=1.0.3 packaging @@ -66,7 +64,7 @@ console_scripts = [options.extras_require] llfuse = llfuse >= 1.3.8 pyfuse3 = pyfuse3 >= 3.1.1 -nofuse = +nofuse = [tool:pytest] python_files = testsuite/*.py diff --git a/setup.py b/setup.py index 169a4f02b..537385b70 100644 --- a/setup.py +++ b/setup.py @@ -234,9 +234,6 @@ if not on_rtd: setup( - use_scm_version={ - 'write_to': 'src/borg/_version.py', - }, cmdclass=cmdclass, ext_modules=ext_modules, long_description=setup_docs.long_desc_from_readme() From f930fe3f26c4d9629d02916d67cf77f62fb0ed8b Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 7 Apr 2022 19:12:19 +0200 Subject: [PATCH 2/2] relax Cython requirement 0.27 was broken, but it will install the latest release anyway now. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0ab3879e6..9261fbe8b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "pkgconfig", "Cython!=0.27", "setuptools_scm[toml]>=6.2"] +requires = ["setuptools", "pkgconfig", "Cython", "setuptools_scm[toml]>=6.2"] build-backend = "setuptools.build_meta" [tool.setuptools_scm]