Commit 1002ab1b authored by Alex Nunes's avatar Alex Nunes

Changelog updates, version numbers, and build script changes

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   build.sh
	modified:   conda.recipe/meta.yaml
	modified:   docs/conf.py
	modified:   resonate/__init__.py
	modified:   setup.py
parent 12705b02
......@@ -5,7 +5,7 @@ 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.4]
## [1.0.5]
### Fixed
- Fixed error raised when passing non-compatible data to `REI`
......
#!/bin/bash
python setup.py sdist
twine upload --skip-existing --repository-url https://test.pypi.org/legacy/ dist/*;
twine upload --skip-existing dist/*;
twine upload --repository-url https://test.pypi.org/legacy/ dist/*;
twine upload dist/*;
rm -f ~/anaconda3/conda-bld/osx-64/resonate*;
conda-build conda.recipe -c conda-forge &&
rm -rf conda-dist &&
......
package:
name: resonate
version: "1.0.4"
version: "1.0.5"
source:
git_rev: master
......
......@@ -76,9 +76,9 @@ copyright = u'2017 Ocean Tracking Network. All Rights Reserved.'
# built documents.
#
# The short X.Y version.
version = 'v1.0.4'
version = 'v1.0.5'
# The full version, including alpha/beta/rc tags.
release = 'v1.0.4'
release = 'v1.0.5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
__author__ = "Alex Nunes"
__credits__ = ["Alex Nunes", "Jon Pye", "Brian Jones", "Marta Mihoff"]
__license__ = "GPL"
__version__ = "1.0.4"
__version__ = "1.0.5"
__maintainer__ = "Alex Nunes"
__email__ = "anunes@dal.ca"
__status__ = "Production"
......@@ -12,7 +12,7 @@ with open('LICENSE') as f:
setup(
name='resonATe',
version='1.0.4',
version='1.0.5',
description='resonate data analysis package',
long_description=readme,
author='Alex Nunes',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment