Skip to content

Commit 244efe6

Browse files
committed
update Makefile to use python3 -m pip for all pip commands
1 parent dd0c1e9 commit 244efe6

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,28 @@ clean: build-clean test-clean clean-cover clean-tox
1818

1919

2020
upload:
21+
python3 -m pip install --upgrade xpip-upload
2122
xpip-upload --config-file .pypirc dist/*
2223

2324

25+
build-prepare:
26+
python3 -m pip install --upgrade -r requirements.txt
27+
python3 -m pip install --upgrade xpip-build
2428
build-clean:
2529
xpip-build --debug setup --clean
26-
build-requirements:
27-
pip3 install -r requirements.txt
28-
build: build-clean build-requirements
30+
build: build-prepare build-clean
2931
xpip-build --debug setup --all
3032

3133

3234
install:
33-
pip3 install --force-reinstall --no-deps dist/*.whl
35+
python3 -m pip install --force-reinstall --no-deps dist/*.whl
3436
uninstall:
35-
pip3 uninstall -y xkits-command
37+
python3 -m pip uninstall -y xkits-command
3638
reinstall: uninstall install
3739

3840

3941
test-prepare:
40-
pip3 install --upgrade mock pylint flake8 pytest pytest-cov
42+
python3 -m pip install --upgrade mock pylint flake8 pytest pytest-cov
4143
pylint:
4244
pylint $(shell git ls-files xkits_command/*.py xargproject/*.py)
4345
flake8:

xargproject/project.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,26 +98,28 @@ def init_makefile(self):
9898
9999
100100
upload:
101+
python3 -m pip install --upgrade xpip-upload
101102
xpip-upload --config-file .pypirc dist/*
102103
103104
105+
build-prepare:
106+
python3 -m pip install --upgrade -r requirements.txt
107+
python3 -m pip install --upgrade xpip-build
104108
build-clean:
105109
xpip-build --debug setup --clean
106-
build-requirements:
107-
pip3 install -r requirements.txt
108-
build: build-clean build-requirements
110+
build: build-prepare build-clean
109111
xpip-build --debug setup --all
110112
111113
112114
install:
113-
pip3 install --force-reinstall --no-deps dist/*.whl
115+
python3 -m pip install --force-reinstall --no-deps dist/*.whl
114116
uninstall:
115-
pip3 uninstall -y {self.name}
117+
python3 -m pip uninstall -y {self.name}
116118
reinstall: uninstall install
117119
118120
119121
test-prepare:
120-
pip3 install --upgrade mock pylint flake8 pytest pytest-cov
122+
python3 -m pip install --upgrade mock pylint flake8 pytest pytest-cov
121123
pylint:
122124
pylint $(shell git ls-files {self.module}/*.py)
123125
flake8:

0 commit comments

Comments
 (0)