Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions autorelease-travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# AUTORELEASE v0.1.0
# AUTORELEASE v0.1.1
# for nonrelease, use @master
# for release, use v${VERSION}, e.g., v1.0.0
import:
- dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.1.0
- dwhswenson/autorelease:travis_stages/cut_release.yml@v0.1.0
- dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.1.0
- dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.1.0
- dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.1.1
- dwhswenson/autorelease:travis_stages/cut_release.yml@v0.1.1
- dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.1.1
- dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.1.1
16 changes: 13 additions & 3 deletions autorelease/git_repo_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@ def _versions_from_tags(self):
# this takes the version (before the '_') and drops the preceding v
tag_versions = [t.name.split('_')[0][1:] for t in self.repo.tags]
# TODO: may be better to replace with regex for reusability
return [vers.Version(v) for v in tag_versions]
versions = []
for version in tag_versions:
try:
v = vers.Version(version)
except vers.InvalidVersion:
pass
else:
versions.append(v)
return versions
# return [vers.Version(v) for v in tag_versions]

def reasonable_desired_version(self, desired_version, allow_equal=False,
allow_patch_skip=False):
Expand All @@ -69,8 +78,9 @@ def reasonable_desired_version(self, desired_version, allow_equal=False,
# no tags yet, and legal version is legal!
return ""
max_version = max(self._versions_from_tags()).base_version
(old_major, old_minor, old_patch) = \
map(int, str(max_version).split('.'))
parts = list(map(int, str(max_version).split('.')))
parts += [0] * (3 - len(parts))
old_major, old_minor, old_patch = parts

update_str = str(max_version) + " -> " + str(desired_version)

Expand Down
2 changes: 1 addition & 1 deletion autorelease/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

def conda_recipe_version(recipe_file):
with open(recipe_file) as f:
dct = yaml.load(f.read())
dct = yaml.load(f.read(), Loader=yaml.FullLoader)
return dct['package']['version']

def github_url_to_owner_repo(url):
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: autorelease
# add ".dev0" for unreleased versions
version: "0.1.0"
version: "0.1.1"

source:
path: ../../
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = autorelease
version = 0.1.0
version = 0.1.1
# version should end in .dev0 if this isn't to be released
short_description = Tools to keep the release process clean.
description = Tools to keep the release process clean.
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ def write_installed_version_py(filename="_installed_version.py",
version = conf.get('metadata', 'version')
git_rev = get_git_version()

# TODO: shouldn't vwe just use the directory found by the
# VersionPyFinder?
if src_dir is None:
src_dir = conf.get('metadata', 'name')

Expand Down