Skip to content

Instantly share code, notes, and snippets.

@rudigiesler
Created August 21, 2014 08:07
Show Gist options
  • Save rudigiesler/c88a64477af2e111ceeb to your computer and use it in GitHub Desktop.
Save rudigiesler/c88a64477af2e111ceeb to your computer and use it in GitHub Desktop.
Version release
$ git checkout develop
$ git tag
go-contacts-0.1.0a
go-contacts-0.1.1
go-contacts-0.1.2
$ SERIES=0.1.x
$ VER=0.1.3
$ NEXTVER=0.1.4a
$ ./utils/bump-version.sh $VER
$ git commit -a -m "Version $VER"
[develop 5c6638e] Version 0.1.3
3 files changed, 3 insertions(+), 3 deletions(-)
$ git push
Counting objects: 38, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 632 bytes | 0 bytes/s, done.
Total 7 (delta 5), reused 0 (delta 0)
To git@github.com:praekelt/go-contacts-api.git
7253e3f..5c6638e develop -> develop
$ git checkout release/$SERIES
Branch release/0.1.x set up to track remote branch release/0.1.x from origin.
Switched to a new branch 'release/0.1.x'
$ git merge develop
Auto-merging verified-fake/setup.py
CONFLICT (content): Merge conflict in verified-fake/setup.py
Auto-merging setup.py
CONFLICT (content): Merge conflict in setup.py
Auto-merging go_contacts/__init__.py
CONFLICT (content): Merge conflict in go_contacts/__init__.py
Automatic merge failed; fix conflicts and then commit the result.
...fix merge conflicts...
$ git add -A
$ git commit
[release/0.1.x d38c402] Merge branch 'develop' into release/0.1.x
$ git tag go-contacts-$VER
$ git push
Counting objects: 1, done.
Writing objects: 100% (1/1), 288 bytes | 0 bytes/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To git@github.com:praekelt/go-contacts-api.git
0d98312..d38c402 release/0.1.x -> release/0.1.x
$ git push --tags
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:praekelt/go-contacts-api.git
* [new tag] go-contacts-0.1.3 -> go-contacts-0.1.3
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
$ git merge go-contacts-$VER
Updating dab5fa3..d38c402
Fast-forward
.travis.yml | 11 ++-
go_contacts/__init__.py | 2 +-
go_contacts/backends/__init__.py | 0
go_contacts/backends/contacts.py | 152 +++++++++++++++++++++++++++++
go_contacts/backends/groups.py | 156 +++++++++++++++++++++++++++++
go_contacts/backends/riak.py | 3 +
go_contacts/backends/tests/__init__.py | 0
go_contacts/backends/tests/test_contacts.py | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++
go_contacts/backends/tests/test_groups.py | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++
go_contacts/server.py | 50 ++++++++++
go_contacts/tests/__init__.py | 0
go_contacts/tests/server_contacts_test_mixin.py | 261 +++++++++++++++++++++++++++++++++++++++++++++++++
go_contacts/tests/server_groups_test_mixin.py | 194 ++++++++++++++++++++++++++++++++++++
go_contacts/tests/test_server.py | 281 +++++++++++++++++++++++++++++++++++++++++++++++++++++
requirements.txt | 18 ++++
setup.py | 6 +-
utils/bump-version.sh | 22 +++--
utils/publish.sh | 6 ++
verified-fake/README.rst | 4 +
verified-fake/fake_go_contacts.py | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++
verified-fake/setup.py | 23 +++++
21 files changed, 1994 insertions(+), 12 deletions(-)
create mode 100644 go_contacts/backends/__init__.py
create mode 100644 go_contacts/backends/contacts.py
create mode 100644 go_contacts/backends/groups.py
create mode 100644 go_contacts/backends/riak.py
create mode 100644 go_contacts/backends/tests/__init__.py
create mode 100644 go_contacts/backends/tests/test_contacts.py
create mode 100644 go_contacts/backends/tests/test_groups.py
create mode 100644 go_contacts/server.py
create mode 100644 go_contacts/tests/__init__.py
create mode 100644 go_contacts/tests/server_contacts_test_mixin.py
create mode 100644 go_contacts/tests/server_groups_test_mixin.py
create mode 100644 go_contacts/tests/test_server.py
create mode 100755 utils/publish.sh
create mode 100644 verified-fake/README.rst
create mode 100644 verified-fake/fake_go_contacts.py
create mode 100644 verified-fake/setup.py
$ git push
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:praekelt/go-contacts-api.git
dab5fa3..d38c402 master -> master
$ git checkout go-contacts-$VER
Note: checking out 'go-contacts-0.1.3'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at d38c402... Merge branch 'develop' into release/0.1.x
## ensure: $ pip install wheel twine
$ ./utils/publish.sh
running sdist
running egg_info
writing requirements to go_contacts.egg-info/requires.txt
writing go_contacts.egg-info/PKG-INFO
writing top-level names to go_contacts.egg-info/top_level.txt
writing dependency_links to go_contacts.egg-info/dependency_links.txt
reading manifest file 'go_contacts.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no previously-included files matching '*.pyc' found anywhere in distribution
writing manifest file 'go_contacts.egg-info/SOURCES.txt'
running check
creating go-contacts-0.1.3
creating go-contacts-0.1.3/go_contacts
creating go-contacts-0.1.3/go_contacts.egg-info
creating go-contacts-0.1.3/go_contacts/backends
creating go-contacts-0.1.3/go_contacts/backends/tests
creating go-contacts-0.1.3/go_contacts/tests
making hard links in go-contacts-0.1.3...
hard linking .coveragerc -> go-contacts-0.1.3
hard linking AUTHORS -> go-contacts-0.1.3
hard linking CONTRIBUTING.rst -> go-contacts-0.1.3
hard linking LICENSE -> go-contacts-0.1.3
hard linking MANIFEST.in -> go-contacts-0.1.3
hard linking README.rst -> go-contacts-0.1.3
hard linking requirements.txt -> go-contacts-0.1.3
hard linking setup.py -> go-contacts-0.1.3
hard linking go_contacts/__init__.py -> go-contacts-0.1.3/go_contacts
hard linking go_contacts/server.py -> go-contacts-0.1.3/go_contacts
hard linking go_contacts.egg-info/PKG-INFO -> go-contacts-0.1.3/go_contacts.egg-info
hard linking go_contacts.egg-info/SOURCES.txt -> go-contacts-0.1.3/go_contacts.egg-info
hard linking go_contacts.egg-info/dependency_links.txt -> go-contacts-0.1.3/go_contacts.egg-info
hard linking go_contacts.egg-info/requires.txt -> go-contacts-0.1.3/go_contacts.egg-info
hard linking go_contacts.egg-info/top_level.txt -> go-contacts-0.1.3/go_contacts.egg-info
hard linking go_contacts/backends/__init__.py -> go-contacts-0.1.3/go_contacts/backends
hard linking go_contacts/backends/contacts.py -> go-contacts-0.1.3/go_contacts/backends
hard linking go_contacts/backends/groups.py -> go-contacts-0.1.3/go_contacts/backends
hard linking go_contacts/backends/riak.py -> go-contacts-0.1.3/go_contacts/backends
hard linking go_contacts/backends/tests/__init__.py -> go-contacts-0.1.3/go_contacts/backends/tests
hard linking go_contacts/backends/tests/test_contacts.py -> go-contacts-0.1.3/go_contacts/backends/tests
hard linking go_contacts/backends/tests/test_groups.py -> go-contacts-0.1.3/go_contacts/backends/tests
hard linking go_contacts/tests/__init__.py -> go-contacts-0.1.3/go_contacts/tests
hard linking go_contacts/tests/server_contacts_test_mixin.py -> go-contacts-0.1.3/go_contacts/tests
hard linking go_contacts/tests/server_groups_test_mixin.py -> go-contacts-0.1.3/go_contacts/tests
hard linking go_contacts/tests/test_server.py -> go-contacts-0.1.3/go_contacts/tests
Writing go-contacts-0.1.3/setup.cfg
Creating tar archive
removing 'go-contacts-0.1.3' (and everything under it)
running bdist_wheel
running build
running build_py
installing to build/bdist.linux-x86_64/wheel
running install
running install_lib
creating build/bdist.linux-x86_64/wheel
creating build/bdist.linux-x86_64/wheel/go_contacts
creating build/bdist.linux-x86_64/wheel/go_contacts/backends
copying build/lib.linux-x86_64-2.7/go_contacts/backends/__init__.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends
creating build/bdist.linux-x86_64/wheel/go_contacts/backends/tests
copying build/lib.linux-x86_64-2.7/go_contacts/backends/tests/test_groups.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends/tests
copying build/lib.linux-x86_64-2.7/go_contacts/backends/tests/__init__.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends/tests
copying build/lib.linux-x86_64-2.7/go_contacts/backends/tests/test_contacts.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends/tests
copying build/lib.linux-x86_64-2.7/go_contacts/backends/tests/test_riak.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends/tests
copying build/lib.linux-x86_64-2.7/go_contacts/backends/contacts.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends
copying build/lib.linux-x86_64-2.7/go_contacts/backends/riak.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends
copying build/lib.linux-x86_64-2.7/go_contacts/backends/groups.py -> build/bdist.linux-x86_64/wheel/go_contacts/backends
copying build/lib.linux-x86_64-2.7/go_contacts/__init__.py -> build/bdist.linux-x86_64/wheel/go_contacts
creating build/bdist.linux-x86_64/wheel/go_contacts/tests
copying build/lib.linux-x86_64-2.7/go_contacts/tests/test_server.py -> build/bdist.linux-x86_64/wheel/go_contacts/tests
copying build/lib.linux-x86_64-2.7/go_contacts/tests/__init__.py -> build/bdist.linux-x86_64/wheel/go_contacts/tests
copying build/lib.linux-x86_64-2.7/go_contacts/tests/server_groups_test_mixin.py -> build/bdist.linux-x86_64/wheel/go_contacts/tests
copying build/lib.linux-x86_64-2.7/go_contacts/tests/server_contacts_test_mixin.py -> build/bdist.linux-x86_64/wheel/go_contacts/tests
copying build/lib.linux-x86_64-2.7/go_contacts/server.py -> build/bdist.linux-x86_64/wheel/go_contacts
running install_egg_info
Copying go_contacts.egg-info to build/bdist.linux-x86_64/wheel/go_contacts-0.1.3-py2.7.egg-info
running install_scripts
creating build/bdist.linux-x86_64/wheel/go_contacts-0.1.3.dist-info/WHEEL
running register
running egg_info
writing requirements to go_contacts.egg-info/requires.txt
writing go_contacts.egg-info/PKG-INFO
writing top-level names to go_contacts.egg-info/top_level.txt
writing dependency_links to go_contacts.egg-info/dependency_links.txt
reading manifest file 'go_contacts.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no previously-included files matching '*.pyc' found anywhere in distribution
writing manifest file 'go_contacts.egg-info/SOURCES.txt'
running check
Registering go-contacts to https://pypi.python.org/pypi
Server response (200): OK
Uploading distributions to https://pypi.python.org/pypi
Uploading go-contacts-0.1.3.tar.gz
Uploading go_contacts-0.1.3-py2-none-any.whl
$ git checkout develop
Previous HEAD position was d38c402... Merge branch 'develop' into release/0.1.x
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
$ ./utils/bump-version.sh $NEXTVER
$ git commit -a -m "Version bump"
[develop d52449a] Version bump
3 files changed, 3 insertions(+), 3 deletions(-)
$ git push
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 667 bytes | 0 bytes/s, done.
Total 7 (delta 4), reused 0 (delta 0)
To git@github.com:praekelt/go-contacts-api.git
5c6638e..d52449a develop -> develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment