Skip to content

Commit

Permalink
Merge pull request #202 from TomasTomecek/0.3.1-release
Browse files Browse the repository at this point in the history
0.3.1 release
  • Loading branch information
dhodovsk authored May 2, 2018
2 parents 2d95f23 + 5ab2e61 commit 000be9e
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 20 deletions.
3 changes: 0 additions & 3 deletions .tito/packages/.readme

This file was deleted.

1 change: 0 additions & 1 deletion .tito/packages/conu

This file was deleted.

6 changes: 0 additions & 6 deletions .tito/tito.props

This file was deleted.

3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 0.3.0
# 0.3.1

## New Features

Expand All @@ -14,6 +14,7 @@
* There is a new method to check GPG signatures of RPMs in images.
* Documentation is updated, there is also asciinema demo in README.md.


# 0.2.0

Please note, that our API is still not marked stable yet.
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CONU_REPOSITORY := docker.io/modularitycontainers/conu
TEST_IMAGE_NAME := conu-tests
DOC_EXAMPLE_PATH := "docs/source/examples"
VERSION := 0.3.0
VERSION := 0.3.1

install-dependencies:
./requirements.sh
Expand Down Expand Up @@ -72,11 +72,6 @@ install-conu-in-centos-container: rpm-in-mock-el7
yum install -y /conu/python2-conu-*.el7.centos.noarch.rpm && \
python2 -c 'import conu; print conu.version'"

release:
@echo 'Make sure that conu/version.py is correct'
tito tag --use-version=$(VERSION)
@echo 'Proceed to https://copr.fedorainfracloud.org/coprs/ttomecek/conu/add_build/'

encrypt-password-in-travis-yml:
docker run -ti --rm -v $(CURDIR):/src -w /src docker.io/tianon/travis-cli travis encrypt --add deploy.password -r fedora-modularity/conu $(THE_PASSWORD)

Expand Down
7 changes: 5 additions & 2 deletions conu.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
%endif

Name: %{pypi_name}
Version: 0.3.0
Release: 2%{?dist}
Version: 0.3.1
Release: 1%{?dist}
Summary: library which makes it easy to write tests for your containers

License: GPLv3+
Expand Down Expand Up @@ -180,6 +180,9 @@ rm -rf html/.{doctrees,buildinfo}
%license LICENSE

%changelog
* Wed May 02 2018 Tomas Tomecek <[email protected]> - 0.3.1-1
- 0.3.1 release

* Wed May 02 2018 Dominika Hodovska <[email protected]> 0.3.0-1
- 0.3.0 release

Expand Down
2 changes: 1 addition & 1 deletion conu/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# https://www.python.org/dev/peps/pep-0440/
__version__ = "0.3.0"
__version__ = "0.3.1"

0 comments on commit 000be9e

Please sign in to comment.