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 Jan 2, 2024
1 parent 66eb086 commit 1a54484
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,7 @@ 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 .
- name: run tox env
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 @@ -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
Expand Down
5 changes: 3 additions & 2 deletions requirements.d/development.lock.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions requirements.d/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ setuptools_scm
pip
wheel
virtualenv
build
pkgconfig
tox
pytest
Expand Down
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 1a54484

Please sign in to comment.