Commit a20fb66e authored by Alex Nunes's avatar Alex Nunes
Browse files

Merge branch 'anunes/resonate-dev' into dev

parents c1714f1a 23b41d3b

conda.recipe/meta.yaml

+1 −1
Original line number Diff line number Diff line 
package:

  name: resonate

  version: "0.3.1"

  version: "0.3.2"



source:

  git_rev: master

docs/conf.py

+2 −2
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ copyright = u'2017 Ocean Tracking Network. All Rights Reserved.' 
# built documents.

#

# The short X.Y version.

version = 'v0.3.1'

version = 'v0.3.2'

# The full version, including alpha/beta/rc tags.

release = 'v0.3.1'

release = 'v0.3.2'



# The language for content autogenerated by Sphinx. Refer to documentation

# for a list of supported languages.

docs/installation.rst

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Conda 


.. code:: bash



  conda config --add channels ioos

  conda config --add channels conda-forge

  conda install -c anunes resonate

resonate/__init__.py

+1 −1
Original line number Diff line number Diff line 
__author__ = "Alex Nunes"

__credits__ = ["Alex Nunes", "Jon Pye", "Brian Jones", "Marta Mihoff"]

__license__ = "GPL"

__version__ = "0.3.1"

__version__ = "0.3.2"

__maintainer__ = "Alex Nunes"

__email__ = "anunes@dal.ca"

__status__ = "Production"

setup.py

+2 −2
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-



from setuptools import setup, find_packages



from codecs import open



with open('README', encoding='utf-8') as f:

    readme = f.read()
@@ -11,7 +11,7 @@ with open('LICENSE', encoding='utf-8') as f: 


setup(

    name='resonATe',

    version='0.3.1',

    version='0.3.2',

    description='resonate data analysis package',

    long_description=readme,

    author='Alex Nunes',