Skip to content

Commit

Permalink
use less setup.py, use pip and build
Browse files Browse the repository at this point in the history
todo: clean clean2 build_usage build_man
  • Loading branch information
ThomasWaldmann committed Dec 24, 2023
1 parent 6b85bda commit a4c37dd
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ jobs:
# so, set it here, again.
PKG_CONFIG_PATH: "/usr/local/opt/[email protected]/lib/pkgconfig:$PKG_CONFIG_PATH"
run: |
# pip install -e .
python setup.py -v develop
pip install -e .
# python setup.py -v develop
- name: run pytest via tox
env:
# we already have that in the global env, but something is broken and overwrites that.
Expand Down
3 changes: 1 addition & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,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
Expand Down
1 change: 1 addition & 0 deletions requirements.d/development.lock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ setuptools==69.0.3
setuptools-scm==8.0.4
pip==23.3.2
virtualenv==20.25.0
build==1.0.3
pkgconfig==1.5.5
tox==4.11.4
pytest==7.4.3
Expand Down
1 change: 1 addition & 0 deletions requirements.d/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ setuptools>=64
setuptools_scm>=8
pip
virtualenv
build
pkgconfig
tox
pytest
Expand Down
1 change: 1 addition & 0 deletions scripts/msys2-install-deps
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash

pacman -S --needed --noconfirm git mingw-w64-ucrt-x86_64-{toolchain,pkgconf,zstd,lz4,xxhash,openssl,python,cython,python-setuptools,python-wheel,python-pkgconfig,python-packaging,python-msgpack,python-pip}
pip install build
pip install pyinstaller==5.13.2
2 changes: 1 addition & 1 deletion scripts/sdist-sign
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ else
GPG=qubes-gpg-client-wrapper
fi

python setup.py sdist
python -m build

D=dist/borgbackup-$R.tar.gz

Expand Down

0 comments on commit a4c37dd

Please sign in to comment.