Skip to content

Commit

Permalink
Upgrade oyaml to >=0.8 and PyYAML to >=5.0 (#83)
Browse files Browse the repository at this point in the history
* Upgrade oyaml to >=0.8 and PyYAML to >=5.0

* Upgrade oyaml to >=0.8 and PyYAML to >=5.0

* Add changelog, remove subdependency, bump version, fix test

* Fix versioning
  • Loading branch information
coreypobrien authored and endzyme committed Apr 2, 2019
1 parent 2c68024 commit 3f96673
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0]

### Changes
- Upgraded to oyaml 0.8+

## [1.0.2]

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion reckoner/course.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(self, course_file):
Parse course.yml contents into instances.
"""
self.config = Config()
self._dict = yaml.load(course_file)
self._dict = yaml.load(course_file, Loader=yaml.loader.FullLoader)
if not self.config.helm_args:
self.config.helm_args = self._dict.get('helm_args')
self.helm = HelmClient(default_helm_arguments=self.config.helm_args)
Expand Down
2 changes: 1 addition & 1 deletion reckoner/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '1.0.2'
__version__ = '1.1.0'
__author__ = 'ReactiveOps, Inc.'
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@
packages=find_packages(exclude=('tests','*.tests')),
install_requires=[
"click==6.7",
"PyYAML==4.2b1",
"GitPython==2.1.3",
"oyaml>=0.4",
"oyaml>=0.8",
"coloredlogs==9.0",
"semver==2.8.0"
],
Expand Down
2 changes: 1 addition & 1 deletion tests/test_reckoner.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def test_passes_if_any_charts_exist(self, mock_helm, mock_yaml):
test_course = "./tests/test_course.yml"
git_repo_path = "./test"

course_yaml_dict = yaml.load(file(test_course, 'r'))
course_yaml_dict = yaml.load(file(test_course, 'r'), Loader=yaml.loader.FullLoader)
test_release_names = course_yaml_dict['charts'].keys()
test_repositories = ['stable', 'incubator'],
test_minimum_versions = ['helm', 'reckoner']
Expand Down

0 comments on commit 3f96673

Please sign in to comment.