Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
58cb2cc2
Commit
58cb2cc2
authored
8 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Updated python: reformat code.
parent
9f713829
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
var/spack/repos/builtin/packages/python/package.py
+10
-10
10 additions, 10 deletions
var/spack/repos/builtin/packages/python/package.py
with
10 additions
and
10 deletions
var/spack/repos/builtin/packages/python/package.py
+
10
−
10
View file @
58cb2cc2
...
@@ -37,7 +37,7 @@ class Python(Package):
...
@@ -37,7 +37,7 @@ class Python(Package):
"""
The Python programming language.
"""
"""
The Python programming language.
"""
homepage
=
"
http://www.python.org
"
homepage
=
"
http://www.python.org
"
url
=
"
http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
"
url
=
"
http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
"
version
(
'
3.5.2
'
,
'
3fe8434643a78630c61c6464fe2e7e72
'
)
version
(
'
3.5.2
'
,
'
3fe8434643a78630c61c6464fe2e7e72
'
)
version
(
'
3.5.1
'
,
'
be78e48cdfc1a7ad90efff146dce6cfe
'
)
version
(
'
3.5.1
'
,
'
be78e48cdfc1a7ad90efff146dce6cfe
'
)
...
@@ -54,7 +54,7 @@ class Python(Package):
...
@@ -54,7 +54,7 @@ class Python(Package):
extendable
=
True
extendable
=
True
variant
(
'
tk
'
,
default
=
False
,
description
=
'
Provide support for Tkinter
'
)
variant
(
'
tk
'
,
default
=
False
,
description
=
'
Provide support for Tkinter
'
)
variant
(
'
ucs4
'
,
default
=
False
,
variant
(
'
ucs4
'
,
default
=
False
,
description
=
'
Enable UCS4 (wide) unicode strings
'
)
description
=
'
Enable UCS4 (wide) unicode strings
'
)
# From https://docs.python.org/2/c-api/unicode.html: Python's default
# From https://docs.python.org/2/c-api/unicode.html: Python's default
...
@@ -71,7 +71,7 @@ class Python(Package):
...
@@ -71,7 +71,7 @@ class Python(Package):
depends_on
(
"
ncurses
"
)
depends_on
(
"
ncurses
"
)
depends_on
(
"
sqlite
"
)
depends_on
(
"
sqlite
"
)
depends_on
(
"
zlib
"
)
depends_on
(
"
zlib
"
)
depends_on
(
"
tk
"
,
when
=
"
+tk
"
)
depends_on
(
"
tk
"
,
when
=
"
+tk
"
)
depends_on
(
"
tcl
"
,
when
=
"
+tk
"
)
depends_on
(
"
tcl
"
,
when
=
"
+tk
"
)
patch
(
'
ncurses.patch
'
)
patch
(
'
ncurses.patch
'
)
...
@@ -197,7 +197,7 @@ def filter_compilers(self, spec, prefix):
...
@@ -197,7 +197,7 @@ def filter_compilers(self, spec, prefix):
]
]
for
filename
in
files
:
for
filename
in
files
:
filter_file
(
env
[
'
CC
'
],
self
.
compiler
.
cc
,
filter_file
(
env
[
'
CC
'
],
self
.
compiler
.
cc
,
join_path
(
dirname
,
filename
),
**
kwargs
)
join_path
(
dirname
,
filename
),
**
kwargs
)
filter_file
(
env
[
'
CXX
'
],
self
.
compiler
.
cxx
,
filter_file
(
env
[
'
CXX
'
],
self
.
compiler
.
cxx
,
join_path
(
dirname
,
filename
),
**
kwargs
)
join_path
(
dirname
,
filename
),
**
kwargs
)
...
@@ -273,12 +273,12 @@ def setup_dependent_package(self, module, ext_spec):
...
@@ -273,12 +273,12 @@ def setup_dependent_package(self, module, ext_spec):
module
.
setup_py
=
Executable
(
python_path
+
'
setup.py --no-user-cfg
'
)
module
.
setup_py
=
Executable
(
python_path
+
'
setup.py --no-user-cfg
'
)
# Add variables for lib/pythonX.Y and lib/pythonX.Y/site-packages dirs.
# Add variables for lib/pythonX.Y and lib/pythonX.Y/site-packages dirs.
module
.
python_lib_dir
=
join_path
(
ext_spec
.
prefix
,
module
.
python_lib_dir
=
join_path
(
ext_spec
.
prefix
,
self
.
python_lib_dir
)
self
.
python_lib_dir
)
module
.
python_include_dir
=
join_path
(
ext_spec
.
prefix
,
module
.
python_include_dir
=
join_path
(
ext_spec
.
prefix
,
self
.
python_include_dir
)
self
.
python_include_dir
)
module
.
site_packages_dir
=
join_path
(
ext_spec
.
prefix
,
module
.
site_packages_dir
=
join_path
(
ext_spec
.
prefix
,
self
.
site_packages_dir
)
self
.
site_packages_dir
)
# Make the site packages directory for extensions
# Make the site packages directory for extensions
if
ext_spec
.
package
.
is_extension
:
if
ext_spec
.
package
.
is_extension
:
...
@@ -330,8 +330,8 @@ def write_easy_install_pth(self, exts):
...
@@ -330,8 +330,8 @@ def write_easy_install_pth(self, exts):
continue
continue
if
re
.
search
(
r
'
^(import|#)
'
,
line
):
if
re
.
search
(
r
'
^(import|#)
'
,
line
):
continue
continue
if
(
(
ext
.
name
!=
'
py-setuptools
'
and
if
(
ext
.
name
!=
'
py-setuptools
'
and
re
.
search
(
r
'
setuptools.*egg$
'
,
line
))
)
:
re
.
search
(
r
'
setuptools.*egg$
'
,
line
)):
continue
continue
paths
.
append
(
line
)
paths
.
append
(
line
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment