Skip to content

Commit

Permalink
Squashed 'averager/pyAverager/' changes from 0f5eb0b..c425638
Browse files Browse the repository at this point in the history
c425638 Update __init__.py
e340d4c Update README
bffb962 Update setup.py
REVERT: 0f5eb0b Merge pull request NCAR#34 from NCAR/devel
REVERT: 34747e1 Merge pull request NCAR#29 from NCAR/devel
REVERT: fa67fce Merge pull request NCAR#26 from NCAR/devel
REVERT: 4ac6f44 Merge pull request NCAR#24 from NCAR/devel
REVERT: 3fc272d Merge pull request NCAR#22 from NCAR/devel
REVERT: 108739b Merge pull request NCAR#20 from NCAR/devel
REVERT: 490ba39 Merge pull request NCAR#18 from NCAR/devel
REVERT: d34c46e Merge pull request NCAR#15 from NCAR/devel
REVERT: d2290b6 Merge pull request NCAR#9 from NCAR/devel
REVERT: 2436413 Merge pull request NCAR#6 from NCAR-CISL-ASAP/devel
REVERT: 2125a4f Merge pull request NCAR#4 from NCAR-CISL-ASAP/devel
REVERT: c51daf1 Merge pull request NCAR#1 from NCAR-CISL-ASAP/devel

git-subtree-dir: averager/pyAverager
git-subtree-split: c425638e984b30ba743dd0dbcb30ff7de071b240
  • Loading branch information
bertinia committed Oct 26, 2017
1 parent e214adc commit da339ee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
August 19, 2016
October 26, 2017

======================================

Expand All @@ -9,7 +9,7 @@ PyAverager
A package used for computing averages from climate model output.

Authors: Sheri Mickelson, Kevin Paul, and John Dennis
Version: 0.9.10
Version: 0.9.12
Copyright: Contained within LICENSE.txt
Comments and feedback: [email protected]

Expand Down
2 changes: 1 addition & 1 deletion pyaverager/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

import PyAverager, specification, PreProc

__version__ = "0.9.10"
__version__ = "0.9.12"

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from distutils.core import setup

setup(name='PyAverager',
version='0.9.10',
version='0.9.12',
description='Parallel Python Averager for Climate Data',
author='Sheri Mickelson',
author_email='[email protected]',
Expand Down

0 comments on commit da339ee

Please sign in to comment.