Merge pull request #7575 from ThomasWaldmann/setup-fixes-master

Setup fixes (master)
2023-05-16 15:06:47 +02:00 · 2023-05-16 15:06:47 +02:00 · 2373d52aa5
parent 4d7c7b0fcb 7bcc4ec884
commit 2373d52aa5
4 changed files with 3 additions and 2 deletions
--- a/requirements.d/development.lock.txt
+++ b/requirements.d/development.lock.txt
@ -1,6 +1,7 @@
 setuptools==67.3.3
 setuptools-scm==7.1.0
 pip==23.0.1
+wheel==0.40.0
 virtualenv==20.19.0
 pkgconfig==1.5.5
 tox==4.0.19
--- a/requirements.d/development.txt
+++ b/requirements.d/development.txt
@ -1,6 +1,7 @@
 setuptools >=45, !=60.6.0, !=60.7.0
 setuptools_scm
 pip
+wheel
 virtualenv
 pkgconfig
 tox
--- a/setup.cfg
+++ b/setup.cfg
@ -36,8 +36,6 @@ packages = find_namespace:
 package_dir =
    =src
 python_requires = >=3.9
-setup_requires =
-   setuptools_scm[toml] >= 6.2
 install_requires =
  msgpack >=1.0.3, <=1.0.5
  packaging
--- a/tox.ini
+++ b/tox.ini
@ -10,6 +10,7 @@ requires =
 	wheel
 	setuptools_scm
 [testenv]
+package = editable  # without this it does not find setup_docs when running under fakeroot
 setenv =
   fuse2: BORG_FUSE_IMPL=llfuse
   fuse3: BORG_FUSE_IMPL=pyfuse3