Skip to content

Commit 761346b

Browse files
committed
first take on pypi upload
1 parent 762574e commit 761346b

File tree

5 files changed

+69
-46
lines changed

5 files changed

+69
-46
lines changed

.travis.yml

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,38 @@
1-
# use 'new'ish container-based infrastructure
21
sudo: required
32
dist: trusty
4-
53
language: python
6-
74
python:
8-
- "2.7"
9-
- "3.5"
10-
11-
# this anaconda setup is taken from http://stackoverflow.com/a/30175390
5+
- '2.7'
6+
- '3.5'
127
before_install:
13-
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
14-
export PYTHON_VERSION=2;
15-
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O $HOME/miniconda2.sh;
16-
fi
17-
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then
18-
export PYTHON_VERSION=3;
19-
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O $HOME/miniconda3.sh;
20-
fi
21-
- chmod +x $HOME/miniconda${PYTHON_VERSION}.sh
22-
- $HOME/miniconda${PYTHON_VERSION}.sh -b;
23-
- export PATH=/home/travis/miniconda${PYTHON_VERSION}/bin:$PATH
24-
- conda update --yes conda
25-
8+
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then export PYTHON_VERSION=2; wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
9+
-O $HOME/miniconda2.sh; fi
10+
- if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then export PYTHON_VERSION=3; wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
11+
-O $HOME/miniconda3.sh; fi
12+
- chmod +x $HOME/miniconda${PYTHON_VERSION}.sh
13+
- "$HOME/miniconda${PYTHON_VERSION}.sh -b;"
14+
- export PATH=/home/travis/miniconda${PYTHON_VERSION}/bin:$PATH
15+
- conda update --yes conda
2616
install:
27-
# this line needs to be updated to match the requirements.txt files
28-
# the conda installer isn't able to process PIP's requirements.txt files
29-
- conda install --yes python=${TRAVIS_PYTHON_VERSION} numpy future scipy matplotlib nose sphinx pep8 coverage mpi4py sympy
30-
- conda list
31-
- pip install --user coloredlogs
32-
- pip install --user travis-sphinx
33-
- sudo apt-get install -y texlive-latex-recommended texlive-fonts-recommended texlive-latex-extra dvipng
34-
17+
- conda install --yes python=${TRAVIS_PYTHON_VERSION} numpy future scipy matplotlib
18+
nose sphinx pep8 coverage mpi4py sympy
19+
- conda list
20+
- pip install --user coloredlogs
21+
- pip install --user travis-sphinx
22+
- sudo apt-get install -y texlive-latex-recommended texlive-fonts-recommended texlive-latex-extra
23+
dvipng
3524
script:
36-
- ./docs/update_apidocs.sh
37-
- mkdir data
38-
- which nosetests
39-
- nosetests tests --with-coverage --cover-inclusive --cover-package=pySDC,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage
40-
- if [[ $PYTHON_VERSION == 3 ]]; then
41-
travis-sphinx build;
42-
fi
43-
25+
- "./docs/update_apidocs.sh"
26+
- mkdir data
27+
- which nosetests
28+
#- nosetests tests --with-coverage --cover-inclusive --cover-package=pySDC,tutorial --cover-html --cover-html-dir=target/doc/build/test_coverage
29+
- if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx build; fi
4430
after_success:
45-
- if [[ $PYTHON_VERSION == 3 ]]; then
46-
travis-sphinx deploy;
47-
fi
31+
- if [[ $PYTHON_VERSION == 3 ]]; then travis-sphinx deploy; fi
32+
deploy:
33+
provider: pypi
34+
user: pancetta
35+
password:
36+
secure: id5Pg/GL/YdXFmbi5h4xLmmyv/0L8lj9Rlr7lFJBrHrmkHIlu78NgO+LnQsGvhSrZqdDvZwRzFFCKRLiDugp07rzfwM41ROPrcgwnSRuqnzG2sUecNulNGHHoqej/z8nG5Ss8k2+viMqpOjhhZoY3LR0D1nFxRzu3HtHs0MKpRc=
37+
on:
38+
tags: true

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014, Parallel-in-Time (PinT) Algorithms
1+
Copyright (c) 2017, Parallel-in-Time (PinT) Algorithms
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

playgrounds/deprecated/acoustic_1d_imex/runconvergence_rk.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
y0 = np.concatenate( (uinit.values[0,:], uinit.values[1,:]) )
9696
y0 = y0.astype('complex')
9797
if ii==0:
98-
print "Time step: %4.2f" % dt
99-
print "Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx)
100-
print "Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx)
98+
print("Time step: %4.2f" % dt)
99+
print("Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx))
100+
print("Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx))
101101

102102
# call main function to get things done...
103103
for n in range(int(ns)):

playgrounds/deprecated/acoustic_1d_imex/runenergy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
file.write('%30.20f' % float(nsteps))
8484
file.close()
8585

86-
print "Time step: %4.2f" % dt
87-
print "Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx)
88-
print "Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx)
86+
print("Time step: %4.2f" % dt)
87+
print("Fast CFL number: %4.2f" % (pparams['cs']*dt/P.dx))
88+
print("Slow CFL number: %4.2f" % (pparams['cadv']*dt/P.dx))
8989

9090
### Run standard integrators first
9191
_dirk = dirk( (P.A+P.Dx).astype('complex'), sparams['maxiter'])

setup.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
from setuptools import setup, find_packages
2+
3+
with open("README.rst", 'r') as f:
4+
long_description = f.read()
5+
6+
setup(
7+
name='pySDC',
8+
version='2.0',
9+
description='A Python implementation of spectral deferred correction methods and the likes',
10+
license="BSD-2",
11+
long_description=long_description,
12+
author='Robert Speck',
13+
author_email='[email protected]',
14+
url="http://www.parallelintime.org/pySDC/",
15+
download_url = "https://github.com/Parallel-in-Time/pySDC/archive/v2.0.tar.gz",
16+
17+
packages=find_packages(),
18+
19+
package_data={
20+
'': ['*.txt', '*.rst'],
21+
},
22+
23+
install_requires=[
24+
'nose>=1.3.7',
25+
'numpy>=1.9.3',
26+
'scipy>=0.17.1',
27+
'future>=0.15.2',
28+
'matplotlib>=1.5.0',
29+
'coloredlogs',
30+
'pep8'
31+
],
32+
)

0 commit comments

Comments
 (0)