Commit 312ebb62 authored by Alex Nunes's avatar Alex Nunes
Browse files

Merge branch 'hotfix' into 'master' 

Hotfix for REI normalization

See merge request otndc/resonate!31
parents 1002ab1b d90f01f5

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. 
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).



## [1.0.6]



### Fixed

- Minor fix to ensure normailzation of REI





## [1.0.5]

conda.recipe/meta.yaml

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

  name: resonate

  version: "1.0.5"

  version: "1.0.6"



source:

  git_rev: master

docs/conf.py

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

#

# The short X.Y version.

version = 'v1.0.5'

version = 'v1.0.6'

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

release = 'v1.0.5'

release = 'v1.0.6'



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

# for a list of supported languages.

docs/notebooks/abacus_plot.ipynb.rst

+0 −1
Original line number Diff line number Diff line
@@ -29,4 +29,3 @@ Or use the standard plotting function to save as HTML: 
.. code:: python



    abacus_plot(df, ipython_display=False, filename='example.html')

docs/notebooks/data_subsetting.ipynb.rst

+0 −1
Original line number Diff line number Diff line
@@ -59,4 +59,3 @@ you’d like to create a subset from. 
    

    # Output the subset data to a new CSV in the indicated directory

    data_column_subset.to_csv(directory+column+"_"+value.replace(" ", "_")+"_"+filename, index=False)