Merge branch 'workshop_2017'

Author: pancetta

.travis.yml

@@ -1,47 +1,38 @@
-# use 'new'ish container-based infrastructure
 sudo: required
 dist: trusty
-
 language: python
-
 python:
-  - "2.7"
-  - "3.5"
-
-# this anaconda setup is taken from http://stackoverflow.com/a/30175390
+- '2.7'
+- '3.5'
 before_install:
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      export PYTHON_VERSION=2;
-      wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O $HOME/miniconda2.sh;
-    fi
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then
-      export PYTHON_VERSION=3;
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O $HOME/miniconda3.sh;
-    fi
-  - chmod +x $HOME/miniconda${PYTHON_VERSION}.sh
-  - $HOME/miniconda${PYTHON_VERSION}.sh -b;
-  - export PATH=/home/travis/miniconda${PYTHON_VERSION}/bin:$PATH
-  - conda update --yes conda
-
+- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then export PYTHON_VERSION=2; wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
+  -O $HOME/miniconda2.sh; fi
+- if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then export PYTHON_VERSION=3; wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  -O $HOME/miniconda3.sh; fi
+- chmod +x $HOME/miniconda${PYTHON_VERSION}.sh
+- "$HOME/miniconda${PYTHON_VERSION}.sh -b;"
+- export PATH=/home/travis/miniconda${PYTHON_VERSION}/bin:$PATH
+- conda update --yes conda
 install:
-  # this line needs to be updated to match the requirements.txt files
-  # the conda installer isn't able to process PIP's requirements.txt files
-  - conda install --yes python=${TRAVIS_PYTHON_VERSION} numpy future scipy matplotlib nose sphinx pep8 coverage mpi4py sympy
-  - conda list
-  - pip install --user coloredlogs
-  - pip install --user travis-sphinx
-  - sudo apt-get install -y texlive-latex-recommended texlive-fonts-recommended texlive-latex-extra dvipng
-
+- conda install --yes python=${TRAVIS_PYTHON_VERSION} numpy future scipy matplotlib
+  nose sphinx pep8 coverage mpi4py sympy
+- conda list
+- pip install --user coloredlogs
+- pip install --user travis-sphinx
+- sudo apt-get install -y texlive-latex-recommended texlive-fonts-recommended texlive-latex-extra
+  dvipng
 script:
-  - ./docs/update_apidocs.sh
-  - mkdir data
-  - which nosetests
-  - nosetests tests --with-coverage --cover-inclusive --cover-package=pySDC,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage
-  - if [[ $PYTHON_VERSION == 3 ]]; then
-      travis-sphinx build;
-    fi
-
+- "./docs/update_apidocs.sh"
+- mkdir data
+- which nosetests
+#- nosetests tests --with-coverage --cover-inclusive --cover-package=pySDC,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage
+- if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx build; fi
 after_success:
-  - if [[ $PYTHON_VERSION == 3 ]]; then
-      travis-sphinx deploy;
-    fi
+- if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx deploy; fi
+deploy:
+  provider: pypi
+  user: pancetta
+  password:
+    secure: id5Pg/GL/YdXFmbi5h4xLmmyv/0L8lj9Rlr7lFJBrHrmkHIlu78NgO+LnQsGvhSrZqdDvZwRzFFCKRLiDugp07rzfwM41ROPrcgwnSRuqnzG2sUecNulNGHHoqej/z8nG5Ss8k2+viMqpOjhhZoY3LR0D1nFxRzu3HtHs0MKpRc=
+  on:
+    tags: true

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Parallel-in-Time (PinT) Algorithms
+Copyright (c) 2017, Parallel-in-Time (PinT) Algorithms
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

playgrounds/deprecated/acoustic_1d_imex/runconvergence_rk.py

@@ -95,9 +95,9 @@
         y0 = np.concatenate( (uinit.values[0,:], uinit.values[1,:]) )
         y0 = y0.astype('complex')
         if ii==0:
-          print "Time step: %4.2f" % dt
-          print "Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx) 
-          print "Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx) 
+          print("Time step: %4.2f" % dt)
+          print("Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx))
+          print("Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx))
 
         # call main function to get things done...
         for n in range(int(ns)):

playgrounds/deprecated/acoustic_1d_imex/runenergy.py

@@ -83,9 +83,9 @@
       file.write('%30.20f' % float(nsteps))
       file.close()
 
-      print "Time step: %4.2f" % dt
-      print "Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx)
-      print "Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx)
+      print("Time step: %4.2f" % dt)
+      print("Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx))
+      print("Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx))
 
       ### Run standard integrators first
       _dirk = dirk( (P.A+P.Dx).astype('complex'), sparams['maxiter'])

setup.py

@@ -0,0 +1,32 @@
+from setuptools import setup, find_packages
+
+with open("README.rst", 'r') as f:
+    long_description = f.read()
+
+setup(
+    name='pySDC',
+    version='2.0',
+    description='A Python implementation of spectral deferred correction methods and the likes',
+    license="BSD-2",
+    long_description=long_description,
+    author='Robert Speck',
+    author_email='[email protected]',
+    url="http://www.parallelintime.org/pySDC/",
+    download_url = "https://github.com/Parallel-in-Time/pySDC/archive/v2.0.tar.gz",
+
+    packages=find_packages(),
+
+    package_data={
+         '': ['*.txt', '*.rst'],
+     },
+
+    install_requires=[
+        'nose>=1.3.7',
+        'numpy>=1.9.3',
+        'scipy>=0.17.1',
+        'future>=0.15.2',
+        'matplotlib>=1.5.0',
+        'coloredlogs',
+        'pep8'
+    ],
+)