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.

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

Move logging code into a subpackage #2420

Merged
merged 6 commits into from
Sep 26, 2016
Merged

Move logging code into a subpackage #2420

merged 6 commits into from
Sep 26, 2016

Conversation

dhermes
Copy link
Contributor

@dhermes dhermes commented Sep 25, 2016

NOTE: Has #2419 as diffbase.

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-logging-subpackage ../hotfix origin/make-pubsub-subpackage
python make_commits.py \
  --git-root "${PROJECT_DIR}/../hotfix" \
  --package logging \
  --package-name "Stackdriver Logging" \
  --readme "${READMES_DIR}/logging/README.rst" \
  --extra-requires $'    \'grpcio >= 1.0.0\',\n    \'google-gax >= 0.14.1, < 0.15dev\',\n    \'gapic-google-logging-v2 >= 0.9.0, < 0.10dev\',\n    \'grpc-google-logging-v2 >= 0.9.0, < 0.10dev\',\n'

NOTE: Since only pubsub and logging had to remove extra deps from GRPC_PACKAGES in setup.py, the 3rd commit is just written the old-fashioned way.

@dhermes dhermes added packaging api: logging Issues related to the Cloud Logging API. 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
logging/README.rst

entries, token = logger.list_entries()
for entry in entries:
print entry.payload

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 dhermes mentioned this pull request Sep 26, 2016
Merged
@dhermes
Moving all pubsub files into subdirectory.
c6558b9 
Done via:

$ mkdir -p pubsub/google/cloud
$ cp google/__init__.py pubsub/google/__init__.py
$ git add pubsub/google/__init__.py
$ cp google/cloud/__init__.py pubsub/google/cloud/__init__.py
$ git add pubsub/google/cloud/__init__.py
$ git mv google/cloud/pubsub pubsub/google/cloud/pubsub
$ git mv unit_tests/pubsub pubsub/unit_tests
@dhermes
Making pubsub subpackage into a proper package.
ddf2b34 
- Adding README, setup.py, MANIFEST.in, .coveragerc and tox.ini
- Adding google-cloud-pubsub as a dependency to the umbrella
  package
- Adding the pubsub subdirectory into the list of packages
  for verifying the docs
- Incorporating the pubsub subdirectory into the umbrella
  coverage report
- Adding the pubsub only tox tests to the Travis config
- Adding {toxinidir}/../core as a dependency for the pubsub
  tox config
@dhermes
Remove Pub / Sub deps from setup.py.
27380f9
@dhermes
Moving all logging files into subdirectory.
e299695 
Done via:

$ mkdir -p logging/google/cloud
$ cp google/__init__.py logging/google/__init__.py
$ git add logging/google/__init__.py
$ cp google/cloud/__init__.py logging/google/cloud/__init__.py
$ git add logging/google/cloud/__init__.py
$ git mv google/cloud/logging logging/google/cloud/logging
$ git mv unit_tests/logging logging/unit_tests
@dhermes
Making logging subpackage into a proper package.
4077f3f 
- Adding README, setup.py, MANIFEST.in, .coveragerc and tox.ini
- Adding google-cloud-logging as a dependency to the umbrella
  package
- Adding the logging subdirectory into the list of packages
  for verifying the docs
- Incorporating the logging subdirectory into the umbrella
  coverage report
- Adding the logging only tox tests to the Travis config
- Adding {toxinidir}/../core as a dependency for the logging
  tox config
@dhermes
Remove logging deps from setup.py.
d4cc658 
In the process removing GRPC_PACKAGES entirely.
@dhermes
Copy link
Contributor Author

dhermes commented Sep 26, 2016

Like #2416, #2417, #2418, 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 0c0c8ad into googleapis:master Sep 26, 2016
@dhermes dhermes deleted the make-logging-subpackage branch September 26, 2016 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theacodes theacodes theacodes approved these changes

Assignees

@tseaver tseaver

@theacodes theacodes

Labels
api: logging Issues related to the Cloud Logging 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.

None yet
4 participants
@dhermes @tseaver @theacodes @googlebot