Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to autover #214

Merged
merged 8 commits into from Mar 5, 2018
Merged

Switch to autover #214

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43281a4
Switch to autover.
ceball Mar 5, 2018
96c43bc
Get conda version from setup.py.
ceball Mar 5, 2018
7bc0b09
Ignore lint.
ceball Mar 5, 2018
52cfc2f
Removed stray comment.
ceball Mar 5, 2018
f8fe401
Removed version tests (now part of autover).
ceball Mar 5, 2018
ea2f185
Restored full setup functions as recommended for autover.
ceball Mar 5, 2018
66618a3
Added warning when detecting old-style usage of param.Version
jlstevens Mar 5, 2018
0954adf
Removed redundant release=None when declaring the param.Version
jlstevens Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion param/version.py
View file
Open in desktop
Expand Up @@ -168,7 +168,7 @@ class Version(object):
supplied."""

def __init__(self, release=None, fpath=None, commit=None, reponame=None,
commit_count_prefix='.post', archive_commit=None):
commit_count_prefix='.post', archive_commit=None, **kwargs):
"""
:release: Release tuple (corresponding to the current VCS tag)
:commit Short SHA. Set to '$Format:%h$' for git archive support.
Expand All @@ -177,6 +177,10 @@ def __init__(self, release=None, fpath=None, commit=None, reponame=None,
"""
self.fpath = fpath
self._expected_commit = commit

if release is not None or 'commit_count' in kwargs:
print('WARNING: param.Version now supports PEP440 and a new tag based workflow. See param/version.py for more details')

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to use param.warning but that will probably cause cyclic import issues unless I inline the import? Is a print statement ok in this case and do you have any suggestions for a better message?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using print is ok by me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is so simple I didn't test it locally. I would wait for travis here and also on autover where I'll port this change across now. The only thing I'm wondering about is whether this print will be triggered in some of the unit tests.

self.expected_release = release

self._commit = None if (commit is None or commit.startswith("$Format")) else commit
Expand Down