Ready: Make Riak PB a submodule #418
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "riak_pb"] | ||
| path = riak_pb | ||
| url = git://github.com/basho/riak_pb.git |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| include docs/* | ||
| include riak/erl_src/* | ||
| include README.rst | ||
| include LICENSE | ||
| include RELEASE_NOTES.md | ||
| include version.py | ||
| include commands.py |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| .PHONY: pb_clean pb_compile pb_build release | ||
|
|
||
| clean: pb_clean | ||
|
|
||
| pb_clean: | ||
| @echo "==> Python (clean)" | ||
| @rm -rf riak/pb/*_pb2.py riak/pb/*.pyc riak/pb/__pycache__ __pycache__ py-build | ||
|
|
||
| pb_compile: pb_clean | ||
| @echo "==> Python (compile)" | ||
| @protoc -Iriak_pb/src --python_out=riak/pb riak_pb/src/*.proto | ||
| @python setup.py build_messages | ||
|
|
||
| release: | ||
| ifeq ($(RELEASE_GPG_KEYNAME),) | ||
| $(error RELEASE_GPG_KEYNAME must be set to build a release and deploy this package) | ||
| else | ||
| @echo "==> Python 2.7 (release)" | ||
| @python2.7 setup.py build --build-base=py-build/2.7 bdist_egg upload -s -i $(RELEASE_GPG_KEYNAME) | ||
| @echo "==> Python 3.3 (release)" | ||
| @python3.3 setup.py build --build-base=py-build/3.3 bdist_egg upload -s -i $(RELEASE_GPG_KEYNAME) | ||
| @echo "==> Python 3.4 (release)" | ||
| @python3.4 setup.py build --build-base=py-build/3.4 bdist_egg upload -s -i $(RELEASE_GPG_KEYNAME) | ||
| @echo "==> Python 3.5 (release)" | ||
| @python3.5 setup.py build --build-base=py-build/3.5 bdist_egg upload -s -i $(RELEASE_GPG_KEYNAME) | ||
| endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,104 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ ! -d $PYENV_ROOT ]] | ||
|
There was a problem hiding this comment. If you are only looking for the existence of the variable, you can probably do
Contributor
Author
There was a problem hiding this comment. I intended that to both check for existence of the variable and the directory to which it points, in one shot. |
||
| then | ||
| export PYENV_ROOT="$HOME/.pyenv" | ||
| fi | ||
|
|
||
| declare -r PROJDIR="$PWD/.." | ||
| if [[ ! -s $PROJDIR/riak/__init__.py ]] | ||
| then | ||
| echo "[ERROR] script must be run from the buildbot/ dir in github.com/basho/riak-python-client" 1>&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Install pyenv if it's missing | ||
| if [[ ! -d $PYENV_ROOT ]] | ||
| then | ||
| git clone https://github.com/yyuu/pyenv.git $PYENV_ROOT | ||
| else | ||
| (cd $PYENV_ROOT && git fetch --all) | ||
| fi | ||
|
|
||
| (cd $PYENV_ROOT && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))) | ||
|
|
||
|
|
||
| declare -r pyenv_virtualenv_dir="$PYENV_ROOT/plugins/pyenv-virtualenv" | ||
| if [[ ! -d $pyenv_virtualenv_dir ]] | ||
| then | ||
| git clone https://github.com/yyuu/pyenv-virtualenv.git $pyenv_virtualenv_dir | ||
| else | ||
| (cd $pyenv_virtualenv_dir && git fetch --all) | ||
| fi | ||
|
|
||
| (cd $pyenv_virtualenv_dir && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))) | ||
|
|
||
| declare -r pyenv_alias_dir="$PYENV_ROOT/plugins/pyenv-alias" | ||
| if [[ ! -d $pyenv_alias_dir ]] | ||
| then | ||
| git clone https://github.com/s1341/pyenv-alias.git $pyenv_alias_dir | ||
| else | ||
| (cd $pyenv_alias_dir && git pull origin master) | ||
| fi | ||
|
|
||
| # Add pyenv root to PATH | ||
| # and initialize pyenv | ||
| if [[ $PATH != */.pyenv* ]] | ||
| then | ||
| echo "[INFO] adding $PYENV_ROOT/bin to PATH" | ||
| export PATH="$PYENV_ROOT/bin:$PATH" | ||
| fi | ||
|
|
||
| if [[ $(type -t pyenv) != 'function' ]] | ||
| then | ||
| echo "[INFO] init pyenv" | ||
| eval "$(pyenv init -)" | ||
| eval "$(pyenv virtualenv-init -)" | ||
| fi | ||
|
|
||
| # NB: 2.7.8 is special-cased | ||
| for pyver in 2.7 3.3 3.4 3.5 | ||
|
There was a problem hiding this comment. Love how compact this is, but we also need to install Python 2.7.8 to test older versions of Python which still require PyOpenSSL for their security layer.
Contributor
Author
There was a problem hiding this comment. Do we need to test and support that version as it's more than a year old and not the latest version in the 2.7 series? The 2.7.X Python series end-of-life isn't until 2020, but that (in my opinion) means we only need to test on the latest version of that series. I can put code back to test this specific version (2.7.8) if we need to. There was a problem hiding this comment. I know that relatively current distros ship with old Pythons as their defaults. Ubuntu 14.04 ships with 2.7.3 and Centos 7 ships with 2.7.5, for example.
Contributor
Author
There was a problem hiding this comment. ugh! I'll put 2.7.8 back in. |
||
| do | ||
| if ! pyenv versions | fgrep -v 'riak_2.7.8' | fgrep -q "riak_$pyver" | ||
| then | ||
| declare -i pymaj="${pyver%.*}" | ||
| declare -i pymin="${pyver#*.}" | ||
| pyver_latest="$(pyenv install --list | grep -E "^[[:space:]]+$pymaj\\.$pymin\\.[[:digit:]]+\$" | tail -n1 | sed -e 's/[[:space:]]//g')" | ||
|
|
||
| echo "[INFO] installing Python $pyver_latest" | ||
| riak_pyver="riak_$pyver_latest" | ||
| VERSION_ALIAS="$riak_pyver" pyenv install "$pyver_latest" | ||
| pyenv virtualenv "$riak_pyver" "riak-py$pymaj$pymin" | ||
| fi | ||
| done | ||
|
|
||
| if ! pyenv versions | fgrep -q 'riak_2.7.8' | ||
| then | ||
| echo "[INFO] installing Python 2.7.8" | ||
| VERSION_ALIAS='riak_2.7.8' pyenv install '2.7.8' | ||
| pyenv virtualenv 'riak_2.7.8' 'riak-py278' | ||
| fi | ||
|
|
||
| (cd $PROJDIR && pyenv local riak-py35 riak-py34 riak-py33 riak-py27 riak-py278) | ||
|
|
||
| pyenv versions | ||
|
|
||
| if [[ $(python --version) == Python\ 3.* ]] | ||
| then | ||
| pip install --upgrade pip | ||
| for module in six tox python3-protobuf | ||
| do | ||
| if ! pip show --quiet $module | ||
| then | ||
| pip install --ignore-installed $module | ||
| if ! pip show --quiet $module | ||
| then | ||
| echo "[ERROR] install of $module failed" 1>&2 | ||
| exit 1 | ||
| fi | ||
| fi | ||
| done | ||
| pyenv rehash | ||
| else | ||
| echo "[ERROR] expected Python 3 to be 'python' at this point" 1>&2 | ||
| exit 1 | ||
| fi | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure
realpathis installed on all platforms by default. On CentOS 6, for example:$ realpath -bash: realpath: command not foundThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a GNU make built-in, not an external call.