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
7
Merge Requests
7
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
cf69a305
Commit
cf69a305
authored
4 years ago
by
Godefroid Chapelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shut up easy_install deprecation
parent
2563a46e
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
src/zc/buildout/testing.py
src/zc/buildout/testing.py
+6
-0
src/zc/buildout/tests.py
src/zc/buildout/tests.py
+9
-0
zc.recipe.egg_/src/zc/recipe/egg/tests.py
zc.recipe.egg_/src/zc/recipe/egg/tests.py
+4
-0
No files found.
src/zc/buildout/testing.py
View file @
cf69a305
...
...
@@ -601,6 +601,12 @@ ignore_not_upgrading = (
'Not upgrading because not running a local buildout command.
\
n
'
), '')
easy_install_deprecated = (
re.compile(
'WARNING: The easy_install command is deprecated and will be removed in a future version.
\
n
'
), '')
def run_buildout(command):
# Make sure we don't get .buildout
os.environ['HOME'] = os.path.join(os.getcwd(), 'home')
...
...
This diff is collapsed.
Click to expand it.
src/zc/buildout/tests.py
View file @
cf69a305
...
...
@@ -3600,6 +3600,7 @@ def test_suite():
zc
.
buildout
.
testing
.
normalize_script
,
zc
.
buildout
.
testing
.
normalize_egg_py
,
zc
.
buildout
.
testing
.
not_found
,
zc
.
buildout
.
testing
.
easy_install_deprecated
,
zc
.
buildout
.
testing
.
adding_find_link
,
# (re.compile(r"Installing 'zc.buildout >=\S+"), ''),
(
re
.
compile
(
r'__buildout_signature__ = recipes-\
S+
'),
...
...
@@ -3643,6 +3644,7 @@ def test_suite():
zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link,
# (re.compile(r"Installing '
zc
.
buildout
>=
\
S
+
"), ''),
# (re.compile(r"
Getting
distribution
for
'zc.buildout >=
\
S+
"
),
...
...
@@ -3680,6 +3682,7 @@ def test_suite():
zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link,
(re.compile('
zc
.
buildout
.
buildout
.
MissingOption
'),
'
MissingOption
'),
...
...
@@ -3703,6 +3706,7 @@ def test_suite():
zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link,
normalize_bang,
normalize_S,
...
...
@@ -3733,6 +3737,7 @@ def test_suite():
zc.buildout.testing.normalize_open_in_generated_script,
zc.buildout.testing.adding_find_link,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
normalize_bang,
normalize_S,
(re.compile(r'
[
-
d
]
setuptools
-
\
S
+
[.]
egg
'), '
setuptools
.
egg
'),
...
...
@@ -3756,6 +3761,7 @@ def test_suite():
checker=renormalizing.RENormalizing([
zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.adding_find_link,
(re.compile('
at
-
?
0
x
[
^>
]
+
'), '
<
MEM
ADDRESS
>
'),
(re.compile('
http
:
//
localhost
:[
0
-
9
]{
4
,
5
}
/
'),
...
...
@@ -3776,6 +3782,7 @@ def test_suite():
zc.buildout.testing.normalize_egg_py,
zc.buildout.testing.normalize___pycache__,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
zc.buildout.testing.normalize_exception_type_for_python_2_and_3,
zc.buildout.testing.adding_find_link,
normalize_bang,
...
...
@@ -3824,6 +3831,7 @@ def test_suite():
zc
.
buildout
.
testing
.
normalize_script
,
zc
.
buildout
.
testing
.
normalize_egg_py
,
zc
.
buildout
.
testing
.
not_found
,
zc
.
buildout
.
testing
.
easy_install_deprecated
,
zc
.
buildout
.
testing
.
adding_find_link
,
(
re
.
compile
(
r'__buildout_signature__ = recipes-\
S+
'),
'
__buildout_signature__
=
recipes
-
SSSSSSSSSSS
'),
...
...
@@ -3904,6 +3912,7 @@ def test_suite():
zc.buildout.testing.normalize_endings,
zc.buildout.testing.normalize_script,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
normalize_bang,
zc.buildout.testing.adding_find_link,
(re.compile('
Downloading
.
*
setuptools
.
*
egg
\
n
'), ''),
...
...
This diff is collapsed.
Click to expand it.
zc.recipe.egg_/src/zc/recipe/egg/tests.py
View file @
cf69a305
...
...
@@ -50,6 +50,7 @@ def test_suite():
zc
.
buildout
.
tests
.
normalize_bang
,
zc
.
buildout
.
tests
.
normalize_S
,
zc
.
buildout
.
testing
.
not_found
,
zc
.
buildout
.
testing
.
easy_install_deprecated
,
(
re
.
compile
(
r'[d-] zc.buildout(-\
S+)?[.]egg(-li
nk)?'
),
'zc.buildout.egg'
),
(
re
.
compile
(
r'[d-] setuptools-[^-]+-'
),
'setuptools-X-'
),
...
...
@@ -65,6 +66,7 @@ def test_suite():
zc
.
buildout
.
testing
.
normalize_path
,
zc
.
buildout
.
testing
.
normalize_endings
,
zc
.
buildout
.
testing
.
not_found
,
zc
.
buildout
.
testing
.
easy_install_deprecated
,
(
re
.
compile
(
'__buildout_signature__ = '
r'sample-\
S+
\s+'
r'zc.recipe.egg-\
S+
\s+'
...
...
@@ -86,6 +88,7 @@ def test_suite():
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
(re.compile("(d ((ext)?demo(needed)?|other)"
r"-
\
d[.]
\
d-py)
\
d[.]
\
d(-
\
S+)?[.]egg
"
),
'
\\
1
V
.
V
.
egg
'),
...
...
@@ -117,6 +120,7 @@ def test_suite():
zc.buildout.testing.normalize_path,
zc.buildout.testing.normalize_endings,
zc.buildout.testing.not_found,
zc.buildout.testing.easy_install_deprecated,
])
),
))
...
...
This diff is collapsed.
Click to expand it.
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