Skip to content

Move datastore code into a subpackage #2417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
dhermes merged 3 commits into from
Sep 26, 2016
Merged

Move datastore code into a subpackage #2417

dhermes merged 3 commits into from
Sep 26, 2016

Conversation

@dhermes
Copy link
Contributor

@dhermes dhermes commented Sep 25, 2016 •
edited
Loading

This PR was created via: https://gist.github.com/dhermes/e239691aa584bd56a5352e34aad27cf3

export PROJECT_DIR="${HOME}/google-cloud-python"
export READMES_DIR="${HOME}/i-wrote-some-readmes-for-2357"
cd ${PROJECT_DIR}
git worktree add -b make-datastore-subpackage ../hotfix official/master
python make_commits.py \
  --git-root "${PROJECT_DIR}/../hotfix" \
  --package datastore \
  --package-name "Google Cloud Datastore" \
  --readme "${READMES_DIR}/datastore/README.rst" \
  --extra-requires $'    \'grpcio >= 1.0.0\',\n' \
  --maybe-omit $'omit =\n    */_generated/*.py\n'

NOTE: Since only bigtable and datastore had to touch the run_pylint and tox.ini configs for ignoring generated code, the 3rd commit is just written the old-fashioned way.

@dhermes dhermes added api: datastore Issues related to the Datastore API. packaging labels Sep 25, 2016
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Sep 25, 2016
@dhermes dhermes mentioned this pull request Sep 25, 2016
Closed
32 tasks
theacodes
theacodes approved these changes Sep 25, 2016
View reviewed changes
datastore/setup.py

REQUIREMENTS = [
'google-cloud-core',
'grpcio >= 1.0.0',

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

datastore/setup.py


REQUIREMENTS = [
'google-cloud-core',

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@dhermes dhermes mentioned this pull request Sep 26, 2016
Merged
@dhermes dhermes force-pushed the make-datastore-subpackage branch from e98911b to 5cc0b29 Compare September 26, 2016 17:24
daspecster
daspecster reviewed Sep 26, 2016
View reviewed changes
.travis.yml
- tox -e lint
- tox -e cover
- (cd core && tox -e cover)
- (cd datastore && tox -e cover)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@tseaver
Copy link
Contributor

tseaver commented Sep 26, 2016

LGTM

@dhermes
Moving all datastore files into subdirectory.
5050282 
Done via:

$ mkdir -p datastore/google/cloud
$ cp google/__init__.py datastore/google/__init__.py
$ git add datastore/google/__init__.py
$ cp google/cloud/__init__.py datastore/google/cloud/__init__.py
$ git add datastore/google/cloud/__init__.py
$ git mv google/cloud/datastore datastore/google/cloud/datastore
$ git mv unit_tests/datastore datastore/unit_tests
@dhermes
Making datastore subpackage into a proper package.
115f86e 
- Adding README, setup.py, MANIFEST.in, .coveragerc and tox.ini
- Adding google-cloud-datastore as a dependency to the umbrella
  package
- Adding the datastore subdirectory into the list of packages
  for verifying the docs
- Incorporating the datastore subdirectory into the umbrella
  coverage report
- Adding the datastore only tox tests to the Travis config
- Adding {toxinidir}/../core as a dependency for the datastore
  tox config
@dhermes
Adding extra ignores for datastore generated files.
0401983
@dhermes dhermes force-pushed the make-datastore-subpackage branch from 5cc0b29 to 0401983 Compare September 26, 2016 19:41
@dhermes
Copy link
Contributor Author

dhermes commented Sep 26, 2016

As with #2416, Pushed to resolve rebase conflict and re-ran script. Won't wait on Travis since a) that could be awhile and b) this will be painful.

@dhermes dhermes merged commit 59f234b into googleapis:master Sep 26, 2016
@dhermes dhermes deleted the make-datastore-subpackage branch September 26, 2016 19:42
This was referenced Sep 26, 2016
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@daspecster daspecster daspecster left review comments

@theacodes theacodes theacodes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@tseaver tseaver

@theacodes theacodes

Labels

api: datastore Issues related to the Datastore API. cla: yes This human has signed the Contributor License Agreement. packaging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dhermes @tseaver @daspecster @theacodes @googlebot