Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CSchoel/nolds
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.1
Choose a base ref
..
head repository: CSchoel/nolds
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.3.2
Choose a head ref
Showing with 15 additions and 4 deletions.
  1. +7 −1 CHANGELOG.md
  2. +1 −0 MANIFEST.in
  3. +1 −1 doc/source/conf.py
  4. +6 −2 setup.py
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [0.3.1]
## [0.3.2] - 2016-11-19
### Added
- `LICENSE.txt` is now part of the distribution
- specifies platform (any) and license (MIT) in `setup.py`
- loads `long_description` from `README.rst`

## [0.3.1] - 2016-11-18
### Fixed
- typo in `setup.py` regarding `extras_require`

1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include LICENSE.txt
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@
# The short X.Y version.
version = '0.3'
# The full version, including alpha/beta/rc tags.
release = '0.3.1'
release = '0.3.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -22,14 +22,18 @@ def run(self):
shutil.rmtree("dist")
shutil.rmtree("nolds.egg-info")


version = '0.3.1'
with open("README.rst", "r", encoding="utf-8") as f:
readme = f.read()
version = '0.3.2'
setup(
name='nolds',
packages=['nolds'],
version=version,
platforms="any",
license="MIT",
description='Nonlinear measures for dynamical systems '
+ '(based on one-dimensional time series)',
long_description=readme,
author='Christopher Schölzel',
author_email='christopher.schoelzel@gmx.net',
url='https://github.com/CSchoel/nolds',