Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
c7f5cf05
Commit
c7f5cf05
authored
Oct 15, 2022
by
Godefroid Chapelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable pinning version of pip and setuptools
in the dev environment
parent
1ef1daf7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
82 additions
and
10 deletions
+82
-10
Makefile
Makefile
+16
-4
dev.py
dev.py
+66
-6
No files found.
Makefile
View file @
c7f5cf05
HERE
=
$(
shell
pwd
)
PYTHON_VER
?=
3.8
PIP_VERSION
?=
SETUPTOOLS_VERSION
?=
PYTHON_PATH
=
$(HERE)
/pythons/
$(PYTHON_VER)
PYTHON_BUILD_DIR
=
$(HERE)
/python_builds
PLATFORM
=
$(
shell
uname
)
...
...
@@ -7,6 +9,16 @@ VENV = $(HERE)/venvs/$(PYTHON_VER)
BUILD_VARIABLES
=
PYTHONWARNINGS
=
"ignore:Setuptools is replacing distutils,ignore:setup.py install is deprecated,ignore:easy_install command is deprecated"
ifeq
($(PIP_VERSION),)
PIP_ARG
=
else
PIP_ARG
=
--pip-version
=
$(PIP_VERSION)
endif
ifeq
($(SETUPTOOLS_VERSION),)
SETUPTOOLS_ARG
=
else
SETUPTOOLS_ARG
=
--setuptools-version
=
$(SETUPTOOLS_VERSION)
endif
ifeq
($(PYTHON_VER),2.7)
PYTHON_MINOR
?=
2.7.18
endif
...
...
@@ -20,7 +32,7 @@ ifeq ($(PYTHON_VER),3.7)
PYTHON_MINOR
?=
3.7.15
endif
ifeq
($(PYTHON_VER),3.8)
PYTHON_MINOR
?=
3.8.1
5
PYTHON_MINOR
?=
3.8.1
2
endif
ifeq
($(PYTHON_VER),3.9)
PYTHON_MINOR
?=
3.9.15
...
...
@@ -100,12 +112,11 @@ $(ALL_COPY):
@
cp
$(
subst
$(VENV)
,
$(HERE)
,
$@
)
$@
$(VENV)/bin/$(PYTHON_EXE)
:
$(PYTHON_PATH)/bin/virtualenv
# @command -v virtualenv >/dev/null 2>&1 || { echo "virtualenv required but not installed" >&2; exit 1;
}
test
-d
"
$(HERE)
/venvs"
||
mkdir
-p
$(HERE)
/venvs
$(PYTHON_PATH)
/bin/virtualenv
-p
$(PYTHON_PATH)
/bin/
$(PYTHON_EXE)
$(VENV)
$(VENV)/bin/test
:
$(VENV)/bin/$(PYTHON_EXE) $(ALL_COPY)
cd
$(VENV)
&&
bin/
$(PYTHON_EXE)
dev.py
--no-clean
cd
$(VENV)
&&
bin/
$(PYTHON_EXE)
dev.py
$(PIP_ARG)
$(SETUPTOOLS_ARG)
--no-clean
$(VENV)/bin/coverage
:
$(VENV)/bin/$(PYTHON_EXE)
$(VENV)
/bin/pip
install
coverage
...
...
@@ -113,7 +124,8 @@ $(VENV)/bin/coverage: $(VENV)/bin/$(PYTHON_EXE)
coverage
:
$(VENV)/bin/coverage $(VENV)/bin/test
COVERAGE_REPORT
=
RUN_COVERAGE
=
$(VENV)
/bin/test
$(testargs)
test
:
$(VENV)/bin/test
test
:
$(VENV)/bin/$(PYTHON_EXE) $(ALL_COPY)
cd
$(VENV)
&&
bin/
$(PYTHON_EXE)
dev.py
$(PIP_ARG)
$(SETUPTOOLS_ARG)
--no-clean
PYTHONWARNINGS
=
$(PYTHONWARNINGS)
$(VENV)
/bin/test
-c
-vvv
$(testargs)
all_pythons
:
...
...
dev.py
View file @
c7f5cf05
...
...
@@ -29,7 +29,7 @@ import os, shutil, subprocess, tempfile
os
.
environ
[
"SETUPTOOLS_USE_DISTUTILS"
]
=
"stdlib"
def
main
():
def
main
(
args
):
for
d
in
'eggs'
,
'develop-eggs'
,
'bin'
,
'parts'
:
if
not
os
.
path
.
exists
(
d
):
os
.
mkdir
(
d
)
...
...
@@ -107,7 +107,8 @@ def main():
try
:
sys
.
stdout
.
flush
()
output
=
subprocess
.
check_output
(
[
sys
.
executable
]
+
[
'-m'
,
'pip'
,
'install'
,
'--upgrade'
,
package
],
[
sys
.
executable
]
+
[
'-m'
,
'pip'
,
'install'
,
'--disable-pip-version-check'
,
'--upgrade'
,
package
],
stderr
=
subprocess
.
STDOUT
,
)
was_up_to_date
=
b"up-to-date"
in
output
or
b"already satisfied"
in
output
...
...
@@ -125,6 +126,32 @@ def main():
return
False
raise
RuntimeError
(
"Upgrade %s failed."
%
package
)
def
install_pinned_version
(
package
,
version
):
print
(
''
)
print
(
'Try to install version %s of %s'
%
(
version
,
package
))
print
(
''
)
try
:
sys
.
stdout
.
flush
()
output
=
subprocess
.
check_output
(
[
sys
.
executable
]
+
[
'-m'
,
'pip'
,
'install'
,
'--disable-pip-version-check'
,
package
+
'=='
+
version
],
stderr
=
subprocess
.
STDOUT
,
)
was_up_to_date
=
b"already satisfied"
in
output
if
not
was_up_to_date
:
print
(
output
.
decode
(
'utf8'
))
return
not
was_up_to_date
except
subprocess
.
CalledProcessError
as
e
:
# some debian/ubuntu based machines
# have broken pip installs
# that cannot import distutils or html5lib
# thus try to install via get-pip
if
(
b"ImportError"
in
e
.
output
or
b"ModuleNotFoundError"
in
e
.
output
)
:
install_pip
()
return
False
raise
RuntimeError
(
"Install %s failed."
%
package
)
def
show
(
package
):
try
:
...
...
@@ -140,10 +167,27 @@ def main():
need_restart
=
False
for
package
in
[
'pip'
,
'setuptools'
,
'wheel'
]:
package
=
'pip'
if
args
.
pip_version
:
did_upgrade
=
install_pinned_version
(
package
,
args
.
pip_version
)
else
:
did_upgrade
=
check_upgrade
(
package
)
show
(
package
)
need_restart
=
need_restart
or
did_upgrade
show
(
package
)
need_restart
=
need_restart
or
did_upgrade
package
=
'setuptools'
if
args
.
setuptools_version
:
did_upgrade
=
install_pinned_version
(
package
,
args
.
setuptools_version
)
else
:
did_upgrade
=
check_upgrade
(
package
)
show
(
package
)
need_restart
=
need_restart
or
did_upgrade
package
=
'wheel'
did_upgrade
=
check_upgrade
(
package
)
show
(
package
)
need_restart
=
need_restart
or
did_upgrade
if
need_restart
:
print
(
"Restart"
)
...
...
@@ -201,5 +245,21 @@ def main():
sys
.
stdout
.
flush
()
sys
.
exit
(
subprocess
.
Popen
(
bin_buildout
).
wait
())
def
parse_args
():
import
argparse
parser
=
argparse
.
ArgumentParser
(
description
=
'Setup buildout development environment'
)
parser
.
add_argument
(
'--pip-version'
,
help
=
'version of pip to install'
,
action
=
'store'
)
parser
.
add_argument
(
'--setuptools-version'
,
help
=
'version of setuptools to install'
,
action
=
'store'
)
parser
.
add_argument
(
'--no-clean'
,
help
=
'not used in the code, find out if still needed in Makefile'
,
action
=
'store_const'
,
const
=
'NO_CLEAN'
)
args
=
parser
.
parse_args
()
return
args
if
__name__
==
'__main__'
:
main
()
main
(
parse_args
()
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment