Skip to content

Commit

Permalink
Merge pull request #366 from JrGoodle/v2.5.0
Browse files Browse the repository at this point in the history
V2.5.0
  • Loading branch information
JrGoodle committed Oct 31, 2017
2 parents 874af57 + 156eb48 commit 6e89c1a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 5 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# 2.5.0

- Add `clowder checkout` command
- Add Sphinx documentation and update docstrings
- Disallow saving a version named "default"
- Add `--skip/-s` option to various commands
- Add ability to reset projects based on timestamp with `clowder reset --timestamp`
- Add `--parallel` option to `clowder herd`, `clowder sync`, `clowder reset`, and `clowder forall`
- Add more badges and setup code climate
- Various refactoring to reduce number of issues on code climate
- Tweak output formatting for refs

# 2.4.0

- Add `clowder reset` command
Expand Down
2 changes: 1 addition & 1 deletion clowder/clowder/cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self):
self.clowder_repo = None
self.versions = None
self.invalid_yaml = False
self._version = '2.4.0'
self._version = '2.5.0'
clowder_path = os.path.join(self.root_directory, '.clowder')

# Load current clowder.yaml config if it exists
Expand Down
2 changes: 1 addition & 1 deletion clowder/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
setup(
name='clowder-repo',
description='A tool for managing code',
version='2.4.0',
version='2.5.0',
url='http://clowder.cat',
author='Joe DeCapo',
author_email='joe@polka.cat',
Expand Down
2 changes: 1 addition & 1 deletion docs/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@

### Environment

- `clowder` version: `2.4.0`
- `clowder` version: `2.5.0`
- OS: macOS
- Python version: 3.6
3 changes: 1 addition & 2 deletions script/update
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" || exit 1

if [ "$1" == 'version' ]; then
cd ..
OLD_VERSION=$(awk "/version='/" setup.py | sed -n -e "s/^.*version='//p" | tr -d "',")
OLD_VERSION=$(awk "/version='/" clowder/setup.py | sed -n -e "s/^.*version='//p" | tr -d "',")
NEW_VERSION=$2

perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" README.md || exit 1
perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" clowder/setup.py || exit 1
perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" clowder/clowder/cmd.py || exit 1
perl -pi -e "s/$OLD_VERSION/$NEW_VERSION/g" docs/issue_template.md || exit 1
Expand Down

0 comments on commit 6e89c1a

Please sign in to comment.