Skip to content

Commit

Permalink
Merge pull request #133 from fedora-modularity/complete-automation
Browse files Browse the repository at this point in the history
0.2.0 release
  • Loading branch information
dhodovsk authored Feb 6, 2018
2 parents 962ac36 + 54c1435 commit 90fb29d
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 6 deletions.
1 change: 1 addition & 0 deletions .tito/packages/conu
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.2.0-1 ./
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ notifications:
email: false
python:
- '2.7'
- '3.5'
- '3.6'
before_install:
- sudo apt-get -y install python-pyxattr
- sudo apt-get -y install gcc libattr1-dev
install:
- pip install -r requirements.txt
script: true
deploy:
provider: pypi
user: conu-pypi-releases
password:
secure: nyKlDIXzy2r1835UKxipCAgpPCL60ELHX60mV9pcBB2lpTDr1W5QAqXKMuJ7+bbwh0VkbLciOIs3whmyxhi4AN+g5hJSYgfkhY8ZdpG1ggfU1EDT5zrCPjRNyIpu9ifUKF5F7Q2l6sR0DhBfIp2HvFOpl2j/4gwSjX8zEfcaVDT+/zXS2NS/4/Z30Y2yTngfzmWGOe1TAPvT8QGt6fhdyd2Jlg4cUuSgvFLLLlX72gvhcxkY6lm/CjQObWs5EGVja/kKu+Go5GHmxBcNjNK2XeshbtmHdOXvqhn2BBSSQ8oZtOpr7TGADBVYJutrpbk92ENR+HUzk1WlPQzxg68NmijaCHDLkfzoqbvl7IM1U36iAwwHxS+2XU17JJg7EONlKtUWFdcuJ85azgoG36bI798X5HKcclI66Cm6TXRJQtVWe16/vsXSXhHMI02+hrdEjcY8m6jecBBYfb2GMA0DUYSJXCPdPfUTBUxR4QPh4kwEQESPw9P75yKgKJbsuu2zzizA/oPwZsjt0gGMIstqNhUIeVOkZTYI9Hpdyib7MT9qd7dIC3SxnNA0tyRahQBN5I/2IZPfGmiaPsrGNUNjAdaq0X9C6TzCXqq2sJKezbntIirIIRF9ZOqlcTqfDbHfe+gjsslg21kqFFt2smpqhmoYrA1u8zzyuBSbs7pm+38=
secure: tKcBpru4FPq0Pdea2xaWzpt0jPxg46gNqZ2KvORSZaEkKX8fl7yzBDDs6QoV2kH8bxK7VZni1DspPSMRN8i873hbf0hI0V3cD37EeaowEDjYQczls7qrMhuJeC/vz+QTSqbMjfcIa6oEDWZ6CiIQZ3xiSBknHeYjGVcxYTyp+9l96Ha9qyLVOWAj4LZ+QhfiqmuMSNH5tzpjTcsJrAP1gxu1dDwE9SjMMJcoeYnYcGQ1MT5yziU++TLXouW37jcBSW2o5Bnlgg7ZwyADIXTz7PSa6i/oaCtv8GgCvlb1pcKi8fYdo//JXEy6K6sqPIq+HsF/Hp9oeQ48G9HGXzeHxP6Wt7PHnclywanxJIQJ0JvhB5suvKZC82kWU/7s27RhjyqUbGxGyPGk8uC0JrOffbn0D/3bZsRVYepLhMtZbQryO8Fd+lI7AS6044ViNqZ4Eps8UlJ7SoIYPoJqwtDiCSw3Qz/E5CRzMNXwLiJi8aU+XXwTaaxi+ByBEuK70EOBdkELHtPnzELRtVRM1llQeKfy5d7lQD8zblPHTFVVM9WQeNbiujxNZ4g2OhnFlgJuSN8ui0GpioAV5owf9n8DIyBpgYRn4OgSeMbF0hJJz5mgNTB6bhtBGl/X/399gRjCPsEk9442v7XHLkVdmg3n3zH7n+SuYv8evpbou9zBsOE=
distributions: sdist bdist_wheel
on:
tags: true
after_deploy:
- make check-pypi-release
- make check-pypi-release
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 0.2.0

Please note, that our API is still not marked stable yet.

## Breaking changes

* We have changed how `logs()` method works. It now returns iterator always. On
top of it, we have implemented more convenience methods to return logs as
bytes and unicode.

* Backend class can (and should) be used as a context manager. This was done
for the sake of creating a temporary directory meant for the backend
instance. The context manager ensures the temporary directory will be removed.

## New Features

* We added support for docker-py version 1 so it can work in CentOS.
* conu will check whether required binaries are present and if not,
`CommandDoesNotExistException` will be raised.
* Our documentation was improved and contains now more examples and the python
interface should be explained in more detail.
* When creating docker containers, conu now utilizes option `--cidfile`.
* `execute()` method can be blocking and non-blocking.
* Backend provides a new methos `cleanup_containers()` to cleanup containers
created during the session.


# 0.1.0

* Initial release.
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
CONU_REPOSITORY := docker.io/modularitycontainers/conu
TEST_IMAGE_NAME := conu-tests
DOC_EXAMPLE_PATH := "docs/source/examples"
VERSION := 0.2.0

install-dependencies:
./requirements.sh
Expand Down Expand Up @@ -62,3 +63,11 @@ install-conu-in-centos-container: rpm-in-mock-el7
docker run -v "/var/lib/mock/epel-7-x86_64/result:/conu" -ti centos:7 bash -c " \
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 ${PWD}:/src -w /src docker.io/tianon/travis-cli travis encrypt --add deploy.password -r fedora-modularity/conu $(THE_PASSWORD)
5 changes: 4 additions & 1 deletion conu.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
%endif

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

Expand Down Expand Up @@ -151,5 +151,8 @@ rm -rf html/.{doctrees,buildinfo}
%license LICENSE

%changelog
* Thu Feb 01 2018 Tomas Tomecek <ttomecek@redhat.com> 0.2.0-1
- 0.2.0 release

* Wed Dec 06 2017 Tomas Tomecek <ttomecek@redhat.com> - 0.1.0-1
- Initial package.
2 changes: 1 addition & 1 deletion conu/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# https://www.python.org/dev/peps/pep-0440/
__version__ = "0.1.0"
__version__ = "0.2.0"
1 change: 1 addition & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ conu gathers utilities that come in handy when creating tests, provides nice log
installation.rst
examples.rst
reference/index.rst
new_releases.rst

Contribution
=============
Expand Down
23 changes: 23 additions & 0 deletions docs/source/new_releases.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
How to release conu
===================

This document covers the release process of conu.

* Create a new pull request. **DO NOT** name the branch with the version, it would confuse git. Better name is `0.2.0-release`.

* Prepare new entry for CHANGELOG.md (run :code:`make release`, `tito` will help).

* Update version in

* Makefile (`VERSION`)
* conu/version.py
* conu.spec

* Merge the pull request.

* Create new release on github, copy the changelog in there.

* Automation should kick in (and release conu on PyPI).

* Build conu in COPR.

0 comments on commit 90fb29d

Please sign in to comment.