Skip to content

Move logging code into a subpackage - #2420

Merged
dhermes merged 6 commits into
googleapis:masterfrom
dhermes:make-logging-subpackage
Sep 26, 2016
Merged

Move logging code into a subpackage#2420
dhermes merged 6 commits into
googleapis:masterfrom
dhermes:make-logging-subpackage

Conversation

@dhermes

@dhermesdhermes commented Sep 25, 2016

Copy link
Copy Markdown
Contributor

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.

@dhermesdhermes added packaging api: logging Issues related to the Cloud Logging API. labels Sep 25, 2016
@googlebotgooglebot added the cla: yes This human has signed the Contributor License Agreement. label Sep 25, 2016
@dhermesdhermes mentioned this pull request Sep 25, 2016
Closed
32 tasks
theacodes
theacodes approved these changes Sep 25, 2016
View reviewed changes
Comment threadlogging/README.rst Outdated

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

@dhermes
dhermesforce-pushed the make-logging-subpackage branch from eee2def to ab4b5beCompareSeptember 26, 2016 16:32
@tseaver

tseaver commented Sep 26, 2016

Copy link
Copy Markdown
Contributor

LGTM

@dhermesdhermes 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
dhermesforce-pushed the make-logging-subpackage branch from ab4b5be to d4cc658CompareSeptember 26, 2016 19:50
@dhermes

dhermes commented Sep 26, 2016

Copy link
Copy Markdown
ContributorAuthor

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:masterSep 26, 2016
@dhermes
dhermes deleted the make-logging-subpackage branch September 26, 2016 19:50
parthea pushed a commit that referenced this pull request Apr 1, 2026
@TrevorBergeron
chore: Ignore ai ops in doctests (#2420)
dc89b23
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@theacodestheacodestheacodes approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@tseavertseaver

@theacodestheacodes

Labels

api: loggingIssues related to the Cloud Logging API.cla: yesThis human has signed the Contributor License Agreement.packaging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dhermes@tseaver@theacodes@googlebot