Skip to content

Commit

Permalink
Merge branch 'hotfix-v2.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
markjonestx committed Oct 16, 2017
2 parents bf7f406 + 01a633a commit 6e0e19b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/)


## [2.2.1] - 2017-10-16
### Fixed
- Setup would pull in unstable Yaml parser


## [2.2.0] - 2017-7-26
### Added
- Process Plugin support for List Data
Expand Down Expand Up @@ -73,6 +78,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)


[Unreleased]: https://github.com/JeffersonLab/PyPWA/compare/v2.2.0...development
[2.2.1]: https://github.com/JeffersonLab/PyPWA/compare/v2.2.0...v2.2.1
[2.2.0]: https://github.com/JeffersonLab/PyPWA/compare/v2.1.0...v2.2.0
[2.1.0]: https://github.com/JeffersonLab/PyPWA/compare/v2.0.0...v2.1.0
[2.0.0]: https://github.com/JeffersonLab/PyPWA/compare/v1.1...v2.0.0
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -45,7 +45,7 @@
"scipy", # Needed for Nestle with multiple ellipsoids.
"nestle", # New more advanced minimizer
"numpy>1,<2.0", # Arrays and optimizations
"ruamel.yaml", # Advanced YAML Parser
"ruamel.yaml<0.15", # Advanced YAML Parser
"tabulate", # Great aesthetic tables
"appdirs", # Attempts to find data locations
"fuzzywuzzy", # Fuzzes the user input
Expand Down

0 comments on commit 6e0e19b

Please sign in to comment.