Skip to content

Ready: Make Riak PB a submodule#418

Merged
borshop merged 25 commits into
masterfrom
features/lrb/riak_pb-submodule
Dec 15, 2015
Merged

Ready: Make Riak PB a submodule#418
borshop merged 25 commits into
masterfrom
features/lrb/riak_pb-submodule

Conversation

@lukebakken
Copy link
Copy Markdown
Contributor

Basically takes the Python stuff out of basho/riak_pb and puts it here.

… on import errors

Getting rid of splat imports

Continuing work to fix riak_pb imports

Finish up changes to bring in riak_pb as a submodule

Small fix for test when security is disabled

tweak test

lint fixes

modify test to fix error

Use all https clone urls, updated submodule commit

Ensure that tox uses the correct executable for Python 2.7.9

Revert deletion of these files

bash script cleanup

All tests pass
@lukebakken lukebakken force-pushed the features/lrb/riak_pb-submodule branch from 4f47d06 to 9aaf03c Compare December 8, 2015 20:36
@lukebakken lukebakken changed the title WIP: Make Riak PB a submodule Ready: Make Riak PB a submodule Dec 8, 2015
Comment thread Makefile Outdated
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use 3.5 for the source tarball, that's fine, but we'll also see a bdist_egg step for 3.5, too. On second thought, are we even going to maintain riak_pb on PyPI going forward?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the bdist_egg thing. From here on out riak_pb can be abandoned if you ask me.

Comment thread buildbot/tox_setup.sh Outdated
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

lukebakken and others added 7 commits December 14, 2015 08:10
# Conflicts:
#	buildbot/Makefile
#	buildbot/tox_setup.sh
#	commands.py
#	riak/tests/__init__.py
#	riak/tests/test_all.py
#	riak/transports/pbc/codec.py
#	riak/transports/pbc/connection.py
#	riak/transports/pbc/stream.py
#	riak/transports/pbc/transport.py
#	setup.py
#	tox.ini
@hazen
Copy link
Copy Markdown

hazen commented Dec 14, 2015

👍 7885c90

borshop added a commit that referenced this pull request Dec 14, 2015
Ready: Make Riak PB a submodule

Reviewed-by: javajolt
@hazen
Copy link
Copy Markdown

hazen commented Dec 14, 2015

👍 9c098dd

borshop added a commit that referenced this pull request Dec 15, 2015
Ready: Make Riak PB a submodule

Reviewed-by: javajolt
@hazen
Copy link
Copy Markdown

hazen commented Dec 15, 2015

@borshop merge

@borshop borshop merged commit 9c098dd into master Dec 15, 2015
@hazen hazen deleted the features/lrb/riak_pb-submodule branch December 15, 2015 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants