From 1a240f50ae13a1104132f0a49777708943d3a510 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 7 Aug 2014 14:35:22 -0700
Subject: [PATCH 1/2] Remove integration tests from Travis
Orchard is going away and Travis will be able to run these soon
anyway.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
.travis.yml | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a2033e68e..474e18074 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,13 @@ language: python
python:
- '2.6'
- '2.7'
-env:
- global:
- - secure: exbot0LTV/0Wic6ElKCrOZmh2ZrieuGwEqfYKf5rVuwu1sLngYRihh+lBL/hTwc79NSu829pbwiWfsQZrXbk/yvaS7avGR0CLDoipyPxlYa2/rfs/o4OdTZqXv0LcFmmd54j5QBMpWU1S+CYOwNkwas57trrvIpPbzWjMtfYzOU=
install:
- pip install .
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
-- sudo curl -L -o /usr/local/bin/orchard https://github.com/orchardup/go-orchard/releases/download/2.0.5/linux
-- sudo chmod +x /usr/local/bin/orchard
-before_script:
- - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then orchard hosts rm -f $TRAVIS_JOB_ID || true; fi'
- - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then orchard hosts create $TRAVIS_JOB_ID; fi'
script:
- - nosetests tests/unit
- flake8 fig
- - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then script/travis-integration; fi'
-after_script:
- - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then orchard hosts rm -f $TRAVIS_JOB_ID; fi'
+ - nosetests tests/unit
deploy:
provider: pypi
user: orchard
From bbcbe9df9fe643c94a5b3b679ce27219eba17b41 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 7 Aug 2014 14:36:49 -0700
Subject: [PATCH 2/2] Upload PyPi package manually
This never worked properly anyway.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
.travis.yml | 8 --------
CONTRIBUTING.md | 5 +++++
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 474e18074..a25d9c4a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,3 @@ install:
script:
- flake8 fig
- nosetests tests/unit
-deploy:
- provider: pypi
- user: orchard
- password:
- secure: M8UMupCLSsB1hV00Zn6ra8Vg81SCFBpbcRsa0nUw9kgXn9hOCESWYVHTqQ1ksWZOa8z6WMaqYtoosPKXGJQNf0wF/kEVDsMUeaZWOF/PqDkx1EwQ1diVfwlbN4/k0iX+Se7SrZfiWnJiAqiIPqToQipvLlJohqf8WwfPcVvILVE=
- on:
- tags: true
- repo: orchardup/fig
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7460a72d4..0c2e770c8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,3 +91,8 @@ The easiest way to do this is to use the `--signoff` flag when committing. E.g.:
5. Publish GitHub release, creating tag
6. Update website with `script/deploy-docs`
+
+7. Upload PyPi package
+
+ $ git checkout $VERSION
+ $ python setup.py sdist upload