Skip to content

Commit

Permalink
Misc PEP8 fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
cbrueffer committed Oct 21, 2014
1 parent 7a1812c commit 682e033
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion doc/source/tutorial/examples/normdiscr_plot1.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

plt.ylabel('Frequency')
plt.title('Frequency and Probability of normdiscrete')
plt.xticks(ind+width, ind )
plt.xticks(ind+width, ind)
plt.legend((rects1[0], rects2[0]), ('true', 'sample'))

plt.show()
4 changes: 2 additions & 2 deletions doc/source/tutorial/examples/normdiscr_plot2.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

plt.ylabel('cdf')
plt.title('Cumulative Frequency and CDF of normdiscrete')
plt.xticks(ind+width, ind )
plt.legend( (rects1[0], rects2[0]), ('true', 'sample') )
plt.xticks(ind+width, ind)
plt.legend((rects1[0], rects2[0]), ('true', 'sample'))

plt.show()
9 changes: 5 additions & 4 deletions pavement.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@
bdist_wininst_simple=Bunch(python_version=PYVER),)

# Where we can find BLAS/LAPACK/ATLAS on Windows/Wine
SITECFG = {"sse3" : {'BLAS': 'None', 'LAPACK': 'None', 'ATLAS': r'C:\local\lib\yop\sse3'},
"sse2" : {'BLAS': 'None', 'LAPACK': 'None', 'ATLAS': r'C:\local\lib\yop\sse2'},
"nosse" : {'ATLAS': 'None', 'BLAS': r'C:\local\lib\yop\nosse',
SITECFG = {"sse3": {'BLAS': 'None', 'LAPACK': 'None', 'ATLAS': r'C:\local\lib\yop\sse3'},
"sse2": {'BLAS': 'None', 'LAPACK': 'None', 'ATLAS': r'C:\local\lib\yop\sse2'},
"nosse": {'ATLAS': 'None', 'BLAS': r'C:\local\lib\yop\nosse',
'LAPACK': r'C:\local\lib\yop\nosse'}}

# Wine config for win32 builds
Expand Down Expand Up @@ -393,6 +393,7 @@ def bdist_wininst_sse3(options):
def bdist_superpack(options):
"""Build all arch specific wininst installers."""
pyver = options.python_version

def copy_bdist(arch):
# Copy the wininst in dist into the release directory
source = os.path.join('dist', wininst_name(pyver))
Expand Down Expand Up @@ -655,7 +656,7 @@ def write_release_task(filename='NOTES.txt'):

def write_log_task(filename='Changelog'):
st = subprocess.Popen(
['git', 'log', '%s..%s' % (LOG_START, LOG_END)],
['git', 'log', '%s..%s' % (LOG_START, LOG_END)],
stdout=subprocess.PIPE)

out = st.communicate()[0]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ def write_version_py(filename='scipy/version.py'):
a = open(filename, 'w')
try:
a.write(cnt % {'version': VERSION,
'full_version' : FULLVERSION,
'git_revision' : GIT_REVISION,
'full_version': FULLVERSION,
'git_revision': GIT_REVISION,
'isrelease': str(ISRELEASED)})
finally:
a.close()
Expand Down
4 changes: 2 additions & 2 deletions tools/cythonize.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def process_tempita_pyx(fromfile, tofile):

rules = {
# fromext : function
'.pyx' : process_pyx,
'.pyx.in' : process_tempita_pyx
'.pyx': process_pyx,
'.pyx.in': process_tempita_pyx
}
#
# Hash db
Expand Down
8 changes: 4 additions & 4 deletions tools/win32/build_scripts/pavement.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
PYVER = '2.5'
ARCH = 'nosse'

PYEXECS = {"2.5" : "C:\python25\python.exe",
"2.4" : "C:\python24\python24.exe",
"2.3" : "C:\python23\python23.exe"}
PYEXECS = {"2.5": "C:\python25\python.exe",
"2.4": "C:\python24\python24.exe",
"2.3": "C:\python23\python23.exe"}

_SSE3_CFG = r"""[atlas]
library_dirs = C:\local\lib\yop\sse3"""
Expand All @@ -27,7 +27,7 @@
[DEFAULT]
library_dirs = C:\local\lib\yop\nosse"""

SITECFG = {"sse2" : _SSE2_CFG, "sse3" : _SSE3_CFG, "nosse" : _NOSSE_CFG}
SITECFG = {"sse2": _SSE2_CFG, "sse3": _SSE3_CFG, "nosse": _NOSSE_CFG}

options(
clean=Bunch(
Expand Down
2 changes: 1 addition & 1 deletion tools/win32/detect_cpu_extensions_wine.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
NUMPY_PY26 = os.environ['HOME'] + '/.wine/drive_c/Python26/Lib/site-packages/numpy/'
NUMPY_PY27 = os.environ['HOME'] + '/.wine/drive_c/Python27/Lib/site-packages/numpy/'
NUMPY_PY31 = os.environ['HOME'] + '/.wine/drive_c/Python31/Lib/site-packages/numpy/'
SSE3_LIBS = os.environ['HOME'] + '/.wine/drive_c/local/lib/yop/sse3'
SSE3_LIBS = os.environ['HOME'] + '/.wine/drive_c/local/lib/yop/sse3'
SSE2_LIBS = os.environ['HOME'] + '/.wine/drive_c/local/lib/yop/sse2'
NOSSE_LIBS = os.environ['HOME'] + '/.wine/drive_c/local/lib/yop/nosse'

Expand Down

0 comments on commit 682e033

Please sign in to comment.