浏览代码

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

Setup fixes (master)
TW 2 年之前
父节点
当前提交
2373d52aa5
共有 4 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      requirements.d/development.lock.txt
  2. 1 0
      requirements.d/development.txt
  3. 0 2
      setup.cfg
  4. 1 0
      tox.ini

+ 1 - 0
requirements.d/development.lock.txt

@@ -1,6 +1,7 @@
 setuptools==67.3.3
 setuptools==67.3.3
 setuptools-scm==7.1.0
 setuptools-scm==7.1.0
 pip==23.0.1
 pip==23.0.1
+wheel==0.40.0
 virtualenv==20.19.0
 virtualenv==20.19.0
 pkgconfig==1.5.5
 pkgconfig==1.5.5
 tox==4.0.19
 tox==4.0.19

+ 1 - 0
requirements.d/development.txt

@@ -1,6 +1,7 @@
 setuptools >=45, !=60.6.0, !=60.7.0
 setuptools >=45, !=60.6.0, !=60.7.0
 setuptools_scm
 setuptools_scm
 pip
 pip
+wheel
 virtualenv
 virtualenv
 pkgconfig
 pkgconfig
 tox
 tox

+ 0 - 2
setup.cfg

@@ -36,8 +36,6 @@ packages = find_namespace:
 package_dir =
 package_dir =
     =src
     =src
 python_requires = >=3.9
 python_requires = >=3.9
-setup_requires =
-   setuptools_scm[toml] >= 6.2
 install_requires =
 install_requires =
   msgpack >=1.0.3, <=1.0.5
   msgpack >=1.0.3, <=1.0.5
   packaging
   packaging

+ 1 - 0
tox.ini

@@ -10,6 +10,7 @@ requires =
 	wheel
 	wheel
 	setuptools_scm
 	setuptools_scm
 [testenv]
 [testenv]
+package = editable  # without this it does not find setup_docs when running under fakeroot
 setenv =
 setenv =
    fuse2: BORG_FUSE_IMPL=llfuse
    fuse2: BORG_FUSE_IMPL=llfuse
    fuse3: BORG_FUSE_IMPL=pyfuse3
    fuse3: BORG_FUSE_IMPL=pyfuse3