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
6
Merge Requests
6
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
cdcc45cf
Commit
cdcc45cf
authored
Mar 20, 2024
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[test] Add tests for build dependencies
parent
4066f7f6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
274 additions
and
24 deletions
+274
-24
src/zc/buildout/tests/__init__.py
src/zc/buildout/tests/__init__.py
+39
-0
src/zc/buildout/tests/downloadcache.txt
src/zc/buildout/tests/downloadcache.txt
+9
-6
src/zc/buildout/tests/easy_install.txt
src/zc/buildout/tests/easy_install.txt
+18
-12
src/zc/buildout/tests/test_all.py
src/zc/buildout/tests/test_all.py
+199
-0
zc.recipe.egg_/src/zc/recipe/egg/README.rst
zc.recipe.egg_/src/zc/recipe/egg/README.rst
+9
-6
No files found.
src/zc/buildout/tests/__init__.py
View file @
cdcc45cf
...
@@ -124,6 +124,45 @@ def create_sample_eggs(test, executable=sys.executable):
...
@@ -124,6 +124,45 @@ def create_sample_eggs(test, executable=sys.executable):
)
)
zc
.
buildout
.
testing
.
bdist_egg
(
tmp
,
sys
.
executable
,
dest
)
zc
.
buildout
.
testing
.
bdist_egg
(
tmp
,
sys
.
executable
,
dest
)
write
(
tmp
,
'builddep.py'
,
''
)
write
(
tmp
,
'setup.py'
,
"from setuptools import setup
\
n
"
"setup(name='builddep', "
" py_modules=['builddep'], "
" zip_safe=True, version='0.1')
\
n
"
)
zc
.
buildout
.
testing
.
sdist
(
tmp
,
dest
)
write
(
tmp
,
'withsetuprequires.py'
,
''
)
write
(
tmp
,
'setup.py'
,
"from setuptools import setup
\
n
"
"setup(name='withsetuprequires', "
" setup_requires = 'builddep', "
" py_modules=['withsetuprequires'], "
" zip_safe=True, version='0.1')
\
n
"
"import builddep"
)
zc
.
buildout
.
testing
.
sdist
(
tmp
,
dest
)
write
(
tmp
,
'withbuildsystemrequires.py'
,
''
)
write
(
tmp
,
'pyproject.toml'
,
'[build-system]
\
n
'
'requires = ["builddep"]'
)
write
(
tmp
,
'setup.py'
,
"from setuptools import setup
\
n
"
"setup(name='withbuildsystemrequires', "
" setup_requires = 'builddep', "
" py_modules=['withbuildsystemrequires'], "
" package_data={'withbuildsystemrequires': ['pyproject.toml']}, "
" zip_safe=True, version='0.1')
\
n
"
"import builddep"
)
zc
.
buildout
.
testing
.
sdist
(
tmp
,
dest
)
finally
:
finally
:
shutil
.
rmtree
(
tmp
)
shutil
.
rmtree
(
tmp
)
...
...
src/zc/buildout/tests/downloadcache.txt
View file @
cdcc45cf
...
@@ -33,11 +33,12 @@ download:
...
@@ -33,11 +33,12 @@ download:
>>> print_(get(link_server), end='')
>>> print_(get(link_server), end='')
<html><body>
<html><body>
<a href="bigdemo-0.1-py2.4.egg">bigdemo-0.1-py2.4.egg</a><br>
<a href="bigdemo-0.1-pyN.N.egg">bigdemo-0.1-pyN.N.egg</a><br>
<a href="demo-0.1-py2.4.egg">demo-0.1-py2.4.egg</a><br>
<a href="builddep-0.1.zip">builddep-0.1.zip</a><br>
<a href="demo-0.2-py2.4.egg">demo-0.2-py2.4.egg</a><br>
<a href="demo-0.1-pyN.N.egg">demo-0.1-pyN.N.egg</a><br>
<a href="demo-0.3-py2.4.egg">demo-0.3-py2.4.egg</a><br>
<a href="demo-0.2-pyN.N.egg">demo-0.2-pyN.N.egg</a><br>
<a href="demo-0.4rc1-py2.4.egg">demo-0.4rc1-py2.4.egg</a><br>
<a href="demo-0.3-pyN.N.egg">demo-0.3-pyN.N.egg</a><br>
<a href="demo-0.4rc1-pyN.N.egg">demo-0.4rc1-pyN.N.egg</a><br>
<a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
<a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
<a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
<a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
<a href="demoneeded-1.2rc1.zip">demoneeded-1.2rc1.zip</a><br>
<a href="demoneeded-1.2rc1.zip">demoneeded-1.2rc1.zip</a><br>
...
@@ -45,7 +46,9 @@ download:
...
@@ -45,7 +46,9 @@ download:
<a href="extdemo-1.4.zip">extdemo-1.4.zip</a><br>
<a href="extdemo-1.4.zip">extdemo-1.4.zip</a><br>
<a href="index/">index/</a><br>
<a href="index/">index/</a><br>
<a href="mixedcase-0.5.zip">mixedcase-0.5.zip</a><br>
<a href="mixedcase-0.5.zip">mixedcase-0.5.zip</a><br>
<a href="other-1.0-py2.4.egg">other-1.0-py2.4.egg</a><br>
<a href="other-1.0-pyN.N.egg">other-1.0-pyN.N.egg</a><br>
<a href="withbuildsystemrequires-0.1.zip">withbuildsystemrequires-0.1.zip</a><br>
<a href="withsetuprequires-0.1.zip">withsetuprequires-0.1.zip</a><br>
</body></html>
</body></html>
...
...
src/zc/buildout/tests/easy_install.txt
View file @
cdcc45cf
...
@@ -97,11 +97,12 @@ We have a link server that has a number of eggs:
...
@@ -97,11 +97,12 @@ We have a link server that has a number of eggs:
>>> print_(get(link_server), end='')
>>> print_(get(link_server), end='')
<html><body>
<html><body>
<a href="bigdemo-0.1-py2.4.egg">bigdemo-0.1-py2.4.egg</a><br>
<a href="bigdemo-0.1-pyN.N.egg">bigdemo-0.1-pyN.N.egg</a><br>
<a href="demo-0.1-py2.4.egg">demo-0.1-py2.4.egg</a><br>
<a href="builddep-0.1.zip">builddep-0.1.zip</a><br>
<a href="demo-0.2-py2.4.egg">demo-0.2-py2.4.egg</a><br>
<a href="demo-0.1-pyN.N.egg">demo-0.1-pyN.N.egg</a><br>
<a href="demo-0.3-py2.4.egg">demo-0.3-py2.4.egg</a><br>
<a href="demo-0.2-pyN.N.egg">demo-0.2-pyN.N.egg</a><br>
<a href="demo-0.4rc1-py2.4.egg">demo-0.4rc1-py2.4.egg</a><br>
<a href="demo-0.3-pyN.N.egg">demo-0.3-pyN.N.egg</a><br>
<a href="demo-0.4rc1-pyN.N.egg">demo-0.4rc1-pyN.N.egg</a><br>
<a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
<a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
<a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
<a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
<a href="demoneeded-1.2rc1.zip">demoneeded-1.2rc1.zip</a><br>
<a href="demoneeded-1.2rc1.zip">demoneeded-1.2rc1.zip</a><br>
...
@@ -109,7 +110,9 @@ We have a link server that has a number of eggs:
...
@@ -109,7 +110,9 @@ We have a link server that has a number of eggs:
<a href="extdemo-1.4.zip">extdemo-1.4.zip</a><br>
<a href="extdemo-1.4.zip">extdemo-1.4.zip</a><br>
<a href="index/">index/</a><br>
<a href="index/">index/</a><br>
<a href="mixedcase-0.5.zip">mixedcase-0.5.zip</a><br>
<a href="mixedcase-0.5.zip">mixedcase-0.5.zip</a><br>
<a href="other-1.0-py2.4.egg">other-1.0-py2.4.egg</a><br>
<a href="other-1.0-pyN.N.egg">other-1.0-pyN.N.egg</a><br>
<a href="withbuildsystemrequires-0.1.zip">withbuildsystemrequires-0.1.zip</a><br>
<a href="withsetuprequires-0.1.zip">withsetuprequires-0.1.zip</a><br>
</body></html>
</body></html>
Let's make a directory and install the demo egg to it, using the demo:
Let's make a directory and install the demo egg to it, using the demo:
...
@@ -1233,11 +1236,12 @@ Let's update our link server with a new version of extdemo:
...
@@ -1233,11 +1236,12 @@ Let's update our link server with a new version of extdemo:
>>> update_extdemo()
>>> update_extdemo()
>>> print_(get(link_server), end='')
>>> print_(get(link_server), end='')
<html><body>
<html><body>
<a href="bigdemo-0.1-py2.4.egg">bigdemo-0.1-py2.4.egg</a><br>
<a href="bigdemo-0.1-pyN.N.egg">bigdemo-0.1-pyN.N.egg</a><br>
<a href="demo-0.1-py2.4.egg">demo-0.1-py2.4.egg</a><br>
<a href="builddep-0.1.zip">builddep-0.1.zip</a><br>
<a href="demo-0.2-py2.4.egg">demo-0.2-py2.4.egg</a><br>
<a href="demo-0.1-pyN.N.egg">demo-0.1-pyN.N.egg</a><br>
<a href="demo-0.3-py2.4.egg">demo-0.3-py2.4.egg</a><br>
<a href="demo-0.2-pyN.N.egg">demo-0.2-pyN.N.egg</a><br>
<a href="demo-0.4rc1-py2.4.egg">demo-0.4rc1-py2.4.egg</a><br>
<a href="demo-0.3-pyN.N.egg">demo-0.3-pyN.N.egg</a><br>
<a href="demo-0.4rc1-pyN.N.egg">demo-0.4rc1-pyN.N.egg</a><br>
<a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
<a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
<a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
<a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
<a href="demoneeded-1.2rc1.zip">demoneeded-1.2rc1.zip</a><br>
<a href="demoneeded-1.2rc1.zip">demoneeded-1.2rc1.zip</a><br>
...
@@ -1246,7 +1250,9 @@ Let's update our link server with a new version of extdemo:
...
@@ -1246,7 +1250,9 @@ Let's update our link server with a new version of extdemo:
<a href="extdemo-1.5.zip">extdemo-1.5.zip</a><br>
<a href="extdemo-1.5.zip">extdemo-1.5.zip</a><br>
<a href="index/">index/</a><br>
<a href="index/">index/</a><br>
<a href="mixedcase-0.5.zip">mixedcase-0.5.zip</a><br>
<a href="mixedcase-0.5.zip">mixedcase-0.5.zip</a><br>
<a href="other-1.0-py2.4.egg">other-1.0-py2.4.egg</a><br>
<a href="other-1.0-pyN.N.egg">other-1.0-pyN.N.egg</a><br>
<a href="withbuildsystemrequires-0.1.zip">withbuildsystemrequires-0.1.zip</a><br>
<a href="withsetuprequires-0.1.zip">withsetuprequires-0.1.zip</a><br>
</body></html>
</body></html>
The easy_install caches information about servers to reduce network
The easy_install caches information about servers to reduce network
...
...
src/zc/buildout/tests/test_all.py
View file @
cdcc45cf
...
@@ -3647,6 +3647,205 @@ def test_buildout_doesnt_keep_adding_itself_to_versions():
...
@@ -3647,6 +3647,205 @@ def test_buildout_doesnt_keep_adding_itself_to_versions():
True
True
"""
"""
def
test_missing_setup_requires_fails
():
r"""
When not allow_picked_versions, ensure setup_requires dependencies
are not installed implicitly without respecting pinned versions.
>>> zc.buildout.easy_install.allow_picked_versions(False)
True
>>> mkdir('dest')
>>> ws = zc.buildout.easy_install.install(
... ['withsetuprequires'], 'dest',
... links=[link_server], index=link_server+'index/',
... versions = dict(withsetuprequires='0.1')) # doctest: +ELLIPSIS
Traceback (most recent call last):
...
subprocess.CalledProcessError: ...pip...wheel... non-zero exit status 1...
>>> zc.buildout.easy_install.allow_picked_versions(True)
False
"""
def
test_available_setup_requires_succeeds
():
r"""
When not allow_picked_versions, ensure setup_requires dependencies
can be installed first and passed explictly.
>>> import subprocess
>>> zc.buildout.easy_install.allow_picked_versions(False)
True
>>> mkdir('dest')
>>> ws = zc.buildout.easy_install.install(
... ['builddep'], 'dest',
... links=[link_server], index=link_server+'index/',
... versions = dict(builddep='0.1'))
>>> import os
>>> builddep_egg = [
... f for f in os.listdir('dest')
... if f.endswith('.egg')
... and f.startswith('builddep')
... ][0]
>>> builddep_path = os.path.join(os.getcwd(), 'dest', builddep_egg)
>>> os.environ['PYTHONEXTRAPATH'] = builddep_path
>>> _ = zc.buildout.easy_install.install(
... ['withsetuprequires'], 'dest',
... links=[link_server], index=link_server+'index/',
... versions = dict(withsetuprequires='0.1'))
>>> del os.environ['PYTHONEXTRAPATH']
>>> zc.buildout.easy_install.allow_picked_versions(True)
False
"""
def
test_missing_build_system_requires_fails
():
r"""
When not allow_picked_versions, ensure build-system.requires dependencies
are not installed implicitly without respecting pinned versions.
>>> zc.buildout.easy_install.allow_picked_versions(False)
True
>>> mkdir('dest')
>>> ws = zc.buildout.easy_install.install(
... ['withbuildsystemrequires'], 'dest',
... links=[link_server], index=link_server+'index/',
... versions = dict(withbuildsystemrequires='0.1'))
... # doctest: +ELLIPSIS
Traceback (most recent call last):
...
subprocess.CalledProcessError: ...pip...wheel... non-zero exit status 1...
>>> zc.buildout.easy_install.allow_picked_versions(True)
False
"""
def
test_available_build_system_requires_succeeds
():
r"""
When not allow_picked_versions, ensure build-system.requires
dependencies can be installed first and passed explictly.
>>> import subprocess
>>> zc.buildout.easy_install.allow_picked_versions(False)
True
>>> mkdir('dest')
>>> ws = zc.buildout.easy_install.install(
... ['builddep'], 'dest',
... links=[link_server], index=link_server+'index/',
... versions = dict(builddep='0.1'))
>>> import os
>>> builddep_egg = [
... f for f in os.listdir('dest')
... if f.endswith('.egg')
... and f.startswith('builddep')
... ][0]
>>> builddep_path = os.path.join(os.getcwd(), 'dest', builddep_egg)
>>> os.environ['PYTHONEXTRAPATH'] = builddep_path
>>> _ = zc.buildout.easy_install.install(
... ['withbuildsystemrequires'], 'dest',
... links=[link_server], index=link_server+'index/',
... versions = dict(withbuildsystemrequires='0.1'))
>>> del os.environ['PYTHONEXTRAPATH']
>>> zc.buildout.easy_install.allow_picked_versions(True)
False
"""
def
test_pin_setup_requires_without_setup_eggs
():
r"""
>>> write('buildout.cfg',
... '''
... [buildout]
... find-links = %(link_server)s
... index = %(link_server)s+'index/'
... allow-picked-versions = false
... newest = false
... parts = withsetuprequires
... [withsetuprequires]
... recipe = zc.recipe.egg
... egg = withsetuprequires
... [versions]
... withsetuprequires = 0.1
... ''' % globals())
>>> print(system(join('bin', 'buildout'))) # doctest: +ELLIPSIS
Installing withsetuprequires.
Getting distribution for 'withsetuprequires==0.1'.
...
...CalledProcessError: ...pip...wheel... non-zero exit status 1...
<BLANKLINE>
"""
def
test_pin_setup_requires_with_setup_eggs
():
"""
>>> write('buildout.cfg',
... '''
... [buildout]
... find-links = %(link_server)s
... index = %(link_server)s+'index/'
... allow-picked-versions = false
... newest = false
... parts = withsetuprequires
... [withsetuprequires]
... recipe = zc.recipe.egg:custom
... egg = withsetuprequires
... setup-eggs = builddep
... [versions]
... withsetuprequires = 0.1
... builddep = 0.1
... ''' % globals())
>>> print(system(join('bin', 'buildout')))
Installing withsetuprequires.
Getting distribution for 'builddep==0.1'.
Got builddep 0.1.
<BLANKLINE>
"""
def
test_pin_build_system_requires_without_setup_eggs
():
r"""
>>> write('buildout.cfg',
... '''
... [buildout]
... find-links = %(link_server)s
... index = %(link_server)s+'index/'
... allow-picked-versions = false
... newest = false
... parts = withbuildsystemrequires
... [withbuildsystemrequires]
... recipe = zc.recipe.egg
... egg = withbuildsystemrequires
... [versions]
... withbuildsystemrequires = 0.1
... ''' % globals())
>>> print(system(join('bin', 'buildout'))) # doctest: +ELLIPSIS
Installing withbuildsystemrequires.
Getting distribution for 'withbuildsystemrequires==0.1'.
...
...CalledProcessError: ...pip...wheel... non-zero exit status 1...
<BLANKLINE>
"""
def
test_pin_build_system_requires_with_setup_eggs
():
"""
>>> write('buildout.cfg',
... '''
... [buildout]
... find-links = %(link_server)s
... index = %(link_server)s+'index/'
... allow-picked-versions = false
... newest = false
... parts = withbuildsystemrequires
... [withbuildsystemrequires]
... recipe = zc.recipe.egg:custom
... egg = withbuildsystemrequires
... setup-eggs = builddep
... [versions]
... withbuildsystemrequires = 0.1
... builddep = 0.1
... ''' % globals())
>>> print(system(join('bin', 'buildout')))
Installing withbuildsystemrequires.
Getting distribution for 'builddep==0.1'.
Got builddep 0.1.
<BLANKLINE>
"""
if
sys
.
platform
==
'win32'
:
if
sys
.
platform
==
'win32'
:
del
buildout_honors_umask
# umask on dohs is academic
del
buildout_honors_umask
# umask on dohs is academic
...
...
zc.recipe.egg_/src/zc/recipe/egg/README.rst
View file @
cdcc45cf
...
@@ -40,11 +40,12 @@ We have a link server that has a number of distributions:
...
@@ -40,11 +40,12 @@ We have a link server that has a number of distributions:
>>> print_(get(link_server), end='')
>>> print_(get(link_server), end='')
<html><body>
<html><body>
<a
href=
"bigdemo-0.1-py2.3.egg"
>
bigdemo-0.1-py2.3.egg
</a><br>
<a
href=
"bigdemo-0.1-pyN.N.egg"
>
bigdemo-0.1-pyN.N.egg
</a><br>
<a
href=
"demo-0.1-py2.3.egg"
>
demo-0.1-py2.3.egg
</a><br>
<a
href=
"builddep-0.1.zip"
>
builddep-0.1.zip
</a><br>
<a
href=
"demo-0.2-py2.3.egg"
>
demo-0.2-py2.3.egg
</a><br>
<a
href=
"demo-0.1-pyN.N.egg"
>
demo-0.1-pyN.N.egg
</a><br>
<a
href=
"demo-0.3-py2.3.egg"
>
demo-0.3-py2.3.egg
</a><br>
<a
href=
"demo-0.2-pyN.N.egg"
>
demo-0.2-pyN.N.egg
</a><br>
<a
href=
"demo-0.4rc1-py2.3.egg"
>
demo-0.4rc1-py2.3.egg
</a><br>
<a
href=
"demo-0.3-pyN.N.egg"
>
demo-0.3-pyN.N.egg
</a><br>
<a
href=
"demo-0.4rc1-pyN.N.egg"
>
demo-0.4rc1-pyN.N.egg
</a><br>
<a
href=
"demoneeded-1.0.zip"
>
demoneeded-1.0.zip
</a><br>
<a
href=
"demoneeded-1.0.zip"
>
demoneeded-1.0.zip
</a><br>
<a
href=
"demoneeded-1.1.zip"
>
demoneeded-1.1.zip
</a><br>
<a
href=
"demoneeded-1.1.zip"
>
demoneeded-1.1.zip
</a><br>
<a
href=
"demoneeded-1.2rc1.zip"
>
demoneeded-1.2rc1.zip
</a><br>
<a
href=
"demoneeded-1.2rc1.zip"
>
demoneeded-1.2rc1.zip
</a><br>
...
@@ -52,7 +53,9 @@ We have a link server that has a number of distributions:
...
@@ -52,7 +53,9 @@ We have a link server that has a number of distributions:
<a
href=
"extdemo-1.4.zip"
>
extdemo-1.4.zip
</a><br>
<a
href=
"extdemo-1.4.zip"
>
extdemo-1.4.zip
</a><br>
<a
href=
"index/"
>
index/
</a><br>
<a
href=
"index/"
>
index/
</a><br>
<a
href=
"mixedcase-0.5.zip"
>
mixedcase-0.5.zip
</a><br>
<a
href=
"mixedcase-0.5.zip"
>
mixedcase-0.5.zip
</a><br>
<a
href=
"other-1.0-py2.3.egg"
>
other-1.0-py2.3.egg
</a><br>
<a
href=
"other-1.0-pyN.N.egg"
>
other-1.0-pyN.N.egg
</a><br>
<a
href=
"withbuildsystemrequires-0.1.zip"
>
withbuildsystemrequires-0.1.zip
</a><br>
<a
href=
"withsetuprequires-0.1.zip"
>
withsetuprequires-0.1.zip
</a><br>
</body></html>
</body></html>
We have a sample buildout. Let's update it's configuration file to
We have a sample buildout. Let's update it's configuration file to
...
...
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