From defcf8e2833dcf3f04abca901e1e0b0c2fe3861b Mon Sep 17 00:00:00 2001 From: Devon Blandin Date: Mon, 18 Apr 2016 17:14:55 -0400 Subject: [PATCH 1/2] Update release process support - Install codeclimate-test-reporter via pip during CircleCI builds (to dogfood) - Add coverage.py and requests packages as install dependencies --- Dockerfile | 4 ++-- Makefile | 6 ++++-- bin/post-release | 9 +++++++++ bin/prep-release | 2 +- bin/release | 6 ++---- circle.yml | 6 ++---- requirements.txt => dev_requirements.txt | 2 +- setup.py | 1 + 8 files changed, 22 insertions(+), 14 deletions(-) create mode 100755 bin/post-release rename requirements.txt => dev_requirements.txt (69%) diff --git a/Dockerfile b/Dockerfile index 46a2759..5b1c72f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ WORKDIR /usr/src/app RUN apk --update add git -COPY requirements.txt /usr/src/app/ +COPY dev_requirements.txt /usr/src/app/ RUN pip install --upgrade pip && \ - pip install -r requirements.txt + pip install -r dev_requirements.txt COPY . /usr/src/app diff --git a/Makefile b/Makefile index fee41f4..685e56c 100644 --- a/Makefile +++ b/Makefile @@ -7,12 +7,14 @@ all: image citest: docker run \ --rm \ + --env COVERAGE_FILE=/tmp/coverage.txt \ --env CIRCLECI \ --env CIRCLE_BRANCH \ --env CIRCLE_SHA1 \ --env CODECLIMATE_REPO_TOKEN \ --entrypoint=/bin/sh \ - $(IMAGE_NAME) -c 'python setup.py test && codeclimate-test-reporter' + --volume /tmp:/tmp \ + $(IMAGE_NAME) -c 'python setup.py test' image: docker build --tag $(IMAGE_NAME) . @@ -32,7 +34,7 @@ release: image --rm \ --volume ~/.pypirc:/home/app/.pypirc \ --entrypoint=/bin/sh \ - $(IMAGE_NAME) -c 'bin/release' + $(IMAGE_NAME) -c 'bin/release' && bin/post-release test-release: image docker run \ diff --git a/bin/post-release b/bin/post-release new file mode 100755 index 0000000..058350e --- /dev/null +++ b/bin/post-release @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Usage: bin/post-release +# +### +set -e + +git tag -f v$(cat reporter/VERSION) +git push origin --tags diff --git a/bin/prep-release b/bin/prep-release index e39557f..f2bd5a7 100755 --- a/bin/prep-release +++ b/bin/prep-release @@ -43,4 +43,4 @@ else echo "hub not installed? Please open the PR manually" >&2 fi -echo "After merging the version-bump PR, run bin/release" +echo "After merging the version-bump PR, run: make release" diff --git a/bin/release b/bin/release index 88f1470..2275fed 100755 --- a/bin/release +++ b/bin/release @@ -7,10 +7,8 @@ # Usage: bin/release # ### +set -e python setup.py build -python setup.py register -r pyp +python setup.py register -r pypi python setup.py sdist upload -r pypi - -git tag v$(cat reporter/VERSION) -git push origin --tags diff --git a/circle.yml b/circle.yml index 37c162b..84e1d0f 100644 --- a/circle.yml +++ b/circle.yml @@ -4,12 +4,10 @@ machine: dependencies: override: + - pip install codeclimate-test-reporter - make image test: override: - make citest - -notify: - webhooks: - - url: https://cc-slack-proxy.herokuapp.com/circle + - codeclimate-test-reporter --file /tmp/coverage.txt diff --git a/requirements.txt b/dev_requirements.txt similarity index 69% rename from requirements.txt rename to dev_requirements.txt index a4dda05..8984eee 100644 --- a/requirements.txt +++ b/dev_requirements.txt @@ -1,5 +1,5 @@ requests -coverage==4.0.3 +coverage>=4.0 pytest-cov pytest HTTPretty diff --git a/setup.py b/setup.py index 2657993..53e6ad3 100644 --- a/setup.py +++ b/setup.py @@ -38,4 +38,5 @@ def run(self): ], }, package_data={"reporter": ["VERSION"]}, + install_requires=["coverage>=4.0", "requests"], ) From 9165748bd1a42763625076f102947e9b49dfba3e Mon Sep 17 00:00:00 2001 From: Devon Blandin Date: Mon, 18 Apr 2016 17:27:22 -0400 Subject: [PATCH 2/2] Release v0.0.3 --- reporter/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reporter/VERSION b/reporter/VERSION index 4e379d2..bcab45a 100644 --- a/reporter/VERSION +++ b/reporter/VERSION @@ -1 +1 @@ -0.0.2 +0.0.3