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 storage code into a subpackage #2416

Merged
merged 2 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-storage-subpackage ../hotfix official/master
python make_commits.py \
  --git-root "${PROJECT_DIR}/../hotfix" \
  --package storage \
  --package-name "Google Cloud Storage" \
  --readme "${READMES_DIR}/storage/README.rst"

@dhermes dhermes added api: storage Issues related to the Cloud Storage API. packaging labels Sep 25, 2016
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Sep 25, 2016
Copy link
Contributor

@theacodes theacodes left a comment

Choose a reason for hiding this comment

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

LGTM with a few tiny things.

bucket = client.get_bucket('bucket-id-here')
# Then do other things...
blob = bucket.get_blob('remote/path/to/file.txt')
print blob.download_as_string()

This comment was marked as spam.

This comment was marked as spam.

@@ -18,6 +19,12 @@ covercmd =
--cov-append \
--cov-config {toxinidir}/.coveragerc \
core/unit_tests
py.test --quiet \

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@theacodes
Copy link
Contributor

LGTM

@tseaver
Copy link
Contributor

tseaver commented Sep 26, 2016

  • Won't the chnages to top-level files conflict with Move bigtable code into a subpackage #2410?
  • The duplication across the sub-repositories (.coveragerc, MANIFEST.in, etc.) is getting worse: to we have an issue to track stripping that out?
  • Likewise the duplication inside the top-level stuff (.travis.yml, tox.ini).

@dhermes
Copy link
Contributor Author

dhermes commented Sep 26, 2016

@tseaver Yes essentially all will conflict, but luckily I can just re-run the script (that is why I ran it).

@tseaver
Copy link
Contributor

tseaver commented Sep 26, 2016

OK, LGTM

Done via:

$ mkdir -p storage/google/cloud
$ cp google/__init__.py storage/google/__init__.py
$ git add storage/google/__init__.py
$ cp google/cloud/__init__.py storage/google/cloud/__init__.py
$ git add storage/google/cloud/__init__.py
$ git mv google/cloud/storage storage/google/cloud/storage
$ git mv unit_tests/storage storage/unit_tests
- Adding README, setup.py, MANIFEST.in, .coveragerc and tox.ini
- Adding google-cloud-storage as a dependency to the umbrella
  package
- Adding the storage subdirectory into the list of packages
  for verifying the docs
- Incorporating the storage subdirectory into the umbrella
  coverage report
- Adding the storage only tox tests to the Travis config
- Adding {toxinidir}/../core as a dependency for the storage
  tox config
@dhermes
Copy link
Contributor Author

dhermes commented Sep 26, 2016

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 a41f08f into googleapis:master Sep 26, 2016
@dhermes dhermes deleted the make-storage-subpackage branch September 26, 2016 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: storage Issues related to the Cloud Storage 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

4 participants