diff --git a/.tito/packages/.readme b/.tito/packages/.readme deleted file mode 100644 index b9411e2d..00000000 --- a/.tito/packages/.readme +++ /dev/null @@ -1,3 +0,0 @@ -the .tito/packages directory contains metadata files -named after their packages. Each file has the latest tagged -version and the project's relative directory. diff --git a/.tito/packages/conu b/.tito/packages/conu deleted file mode 100644 index 99d19105..00000000 --- a/.tito/packages/conu +++ /dev/null @@ -1 +0,0 @@ -0.2.0-1 ./ diff --git a/.tito/tito.props b/.tito/tito.props deleted file mode 100644 index dde14b88..00000000 --- a/.tito/tito.props +++ /dev/null @@ -1,6 +0,0 @@ -[buildconfig] -builder = tito.builder.Builder -tagger = tito.tagger.VersionTagger -changelog_do_not_remove_cherrypick = 0 -changelog_format = %s (%ae) -tag_format = {version} diff --git a/CHANGELOG.md b/CHANGELOG.md index d7af3801..8270ce60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.3.0 +# 0.3.1 ## New Features @@ -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. diff --git a/Makefile b/Makefile index b2bfee43..a9a4c698 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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) diff --git a/conu.spec b/conu.spec index 7be56fd7..f22bbee0 100644 --- a/conu.spec +++ b/conu.spec @@ -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+ @@ -180,6 +180,9 @@ rm -rf html/.{doctrees,buildinfo} %license LICENSE %changelog +* Wed May 02 2018 Tomas Tomecek - 0.3.1-1 +- 0.3.1 release + * Wed May 02 2018 Dominika Hodovska 0.3.0-1 - 0.3.0 release diff --git a/conu/version.py b/conu/version.py index 2b1b1ca6..3eef9c12 100644 --- a/conu/version.py +++ b/conu/version.py @@ -14,4 +14,4 @@ # along with this program. If not, see . # # https://www.python.org/dev/peps/pep-0440/ -__version__ = "0.3.0" +__version__ = "0.3.1"