mirror of https://github.com/borgbackup/borg.git
Merge pull request #8019 from ThomasWaldmann/drop-setup-requires-master
use pip and build
This commit is contained in:
commit
f6d19a33d4
|
@ -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.
|
||||
|
@ -224,8 +223,11 @@ jobs:
|
|||
run: ./scripts/msys2-install-deps development
|
||||
- name: Build
|
||||
run: |
|
||||
pip install -e .
|
||||
# build borg.exe
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib pip install -e .
|
||||
pyinstaller -y scripts/borg.exe.spec
|
||||
# build sdist and wheel in dist/...
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib python -m build
|
||||
- uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: borg-windows
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -3,6 +3,7 @@ setuptools_scm
|
|||
pip
|
||||
wheel
|
||||
virtualenv
|
||||
build
|
||||
pkgconfig
|
||||
tox
|
||||
pytest
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
pacman -S --needed --noconfirm git mingw-w64-ucrt-x86_64-{toolchain,pkgconf,zstd,lz4,xxhash,openssl,python-msgpack,python-argon2_cffi,python-platformdirs,python,cython,python-setuptools,python-wheel,python-pkgconfig,python-packaging,python-pip}
|
||||
pacman -S --needed --noconfirm git mingw-w64-ucrt-x86_64-{toolchain,pkgconf,zstd,lz4,xxhash,openssl,python-msgpack,python-argon2_cffi,python-platformdirs,python,cython,python-setuptools,python-wheel,python-build,python-pkgconfig,python-packaging,python-pip}
|
||||
pip install pyinstaller
|
||||
|
||||
if [ "$1" = "development" ]; then
|
||||
|
|
|
@ -13,7 +13,7 @@ else
|
|||
GPG=qubes-gpg-client-wrapper
|
||||
fi
|
||||
|
||||
python setup.py sdist
|
||||
python -m build
|
||||
|
||||
D=dist/borgbackup-$R.tar.gz
|
||||
|
||||
|
|
Loading…
Reference in New Issue