Bladeren bron

use less setup.py, use pip and build

todo: clean clean2 build_usage build_man
Thomas Waldmann 1 jaar geleden
bovenliggende
commit
1a544845a2
5 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 1 2
      .github/workflows/ci.yml
  2. 1 2
      Vagrantfile
  3. 3 2
      requirements.d/development.lock.txt
  4. 1 0
      requirements.d/development.txt
  5. 1 1
      scripts/sdist-sign

+ 1 - 2
.github/workflows/ci.yml

@@ -177,8 +177,7 @@ jobs:
         # so, set it here, again.
         PKG_CONFIG_PATH: "/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH"
       run: |
-        # pip install -e .
-        python setup.py -v develop
+        pip install -e .
     - name: run tox env
       env:
         # we already have that in the global env, but something is broken and overwrites that.

+ 1 - 2
Vagrantfile

@@ -278,8 +278,7 @@ def install_borg(fuse)
     pip install -U wheel  # upgrade wheel, might be too old
     cd borg
     pip install -r requirements.d/development.lock.txt
-    python setup.py clean
-    python setup.py clean2
+    python setup.py clean clean2
     pip install -e .[#{fuse}]
   EOF
 end

+ 3 - 2
requirements.d/development.lock.txt

@@ -1,8 +1,9 @@
 setuptools==68.2.2
 setuptools-scm==8.0.4
-pip==23.3.1
+pip==23.3.2
 wheel==0.41.3
-virtualenv==20.24.6
+virtualenv==20.25.0
+build==1.0.3
 pkgconfig==1.5.5
 tox==4.11.3
 pytest==7.4.3

+ 1 - 0
requirements.d/development.txt

@@ -3,6 +3,7 @@ setuptools_scm
 pip
 wheel
 virtualenv
+build
 pkgconfig
 tox
 pytest

+ 1 - 1
scripts/sdist-sign

@@ -13,7 +13,7 @@ else
     GPG=qubes-gpg-client-wrapper
 fi
 
-python setup.py sdist
+python -m build
 
 D=dist/borgbackup-$R.tar.gz