Skip to content

Commit 1523f0d

Browse files
committed
cleanup (pleassseee)
1 parent 0b372ba commit 1523f0d

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,17 @@ before_install:
1818
install:
1919
- conda install --yes -c conda-forge petsc4py mpi4py
2020
- conda install --yes python=${TRAVIS_PYTHON_VERSION} pip numpy future scipy matplotlib nose pep8 coverage sympy dill numba sphinx
21-
# - conda install --yes sphinx
2221
- conda list
2322
- pip install coloredlogs
2423
- pip install travis-sphinx
25-
# - sudo apt-get install -y texlive-latex-recommended texlive-fonts-recommended texlive-latex-extra dvipng
24+
- sudo apt-get install -y texlive-latex-recommended texlive-fonts-recommended texlive-latex-extra dvipng
2625

2726
script:
2827
- "./docs/update_apidocs.sh"
2928
- which nosetests
30-
- export MPICH_NO_LOCAL=1
29+
# - export MPICH_NO_LOCAL=1
3130
- export PYTHONPATH=$PYTHONPATH:../../..
32-
- nosetests -s -v pySDC/tests/test_tutorials/test_step_7.py
33-
# - mpirun -np 4 python pySDC/tutorial/step_7/C_pySDC_with_PETSc.py 2
34-
# - nosetests -v --with-coverage --cover-erase --cover-inclusive --cover-package=pySDC/core,pySDC/implementations,pySDC/helpers,pySDC/tutorial,pySDC/projects --cover-html --cover-html-dir=doc/build/test_coverage pySDC/tests
31+
- nosetests -v --with-coverage --cover-erase --cover-inclusive --cover-package=pySDC/core,pySDC/implementations,pySDC/helpers,pySDC/tutorial,pySDC/projects --cover-html --cover-html-dir=doc/build/test_coverage pySDC/tests
3532
- if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx build; fi
3633

3734
after_success:

pySDC/tests/test_tutorials/test_step_6.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def test_C():
1818

1919
if "mpi4py" in flat_installed_packages:
2020

21-
print('Doing MPI stuff now')
22-
2321
cwd = 'pySDC/tutorial/step_6'
2422
main_C(cwd)
2523

pySDC/tests/test_tutorials/test_step_7.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ def test_C_1x1():
2323
cmd = ('mpirun -np ' + str(num_procs) + ' python pySDC/tutorial/step_7/C_pySDC_with_PETSc.py '
2424
+ str(num_procs_space) + ' ' + fname).split()
2525
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=my_env, cwd=cwd)
26-
stdout = p.communicate()[0]
27-
print('STDOUT:{}'.format(stdout))
2826
p.wait()
2927
assert p.returncode == 0, 'ERROR: did not get return code 0, got %s with %2i processes' % \
3028
(p.returncode, num_procs)
@@ -42,8 +40,6 @@ def test_C_1x2():
4240
cmd = ('mpirun -np ' + str(num_procs) + ' python pySDC/tutorial/step_7/C_pySDC_with_PETSc.py '
4341
+ str(num_procs_space) + ' ' + fname).split()
4442
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=my_env, cwd=cwd)
45-
stdout = p.communicate()[0]
46-
print('STDOUT:{}'.format(stdout))
4743
p.wait()
4844
assert p.returncode == 0, 'ERROR: did not get return code 0, got %s with %2i processes' % \
4945
(p.returncode, num_procs)
@@ -61,8 +57,6 @@ def test_C_2x2():
6157
cmd = ('mpirun -np ' + str(num_procs) + ' python pySDC/tutorial/step_7/C_pySDC_with_PETSc.py '
6258
+ str(num_procs_space) + ' ' + fname).split()
6359
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=my_env, cwd=cwd)
64-
stdout = p.communicate()[0]
65-
print('STDOUT:{}'.format(stdout))
6660
p.wait()
6761
assert p.returncode == 0, 'ERROR: did not get return code 0, got %s with %2i processes' % \
6862
(p.returncode, num_procs)

0 commit comments

Comments
 (0)