Skip to content
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.

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

Move datastore code into a subpackage #2417

Merged
merged 3 commits into from
Sep 26, 2016

Conversation

dhermes
Copy link
Contributor

@dhermes dhermes commented Sep 25, 2016

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

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

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.



REQUIREMENTS = [
'google-cloud-core',

This comment was marked as spam.

This comment was marked as spam.

- tox -e lint
- tox -e cover
- (cd core && tox -e cover)
- (cd datastore && tox -e cover)

This comment was marked as spam.

This comment was marked as spam.

@tseaver
Copy link
Contributor

tseaver commented Sep 26, 2016

LGTM

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
- 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
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: datastore Issues related to the Datastore API. cla: yes This human has signed the Contributor License Agreement. packaging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants