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

Fixup nox #462

Merged
merged 4 commits into from
Aug 18, 2016
Merged

Fixup nox #462

merged 4 commits into from
Aug 18, 2016

Conversation

theacodes
Copy link
Contributor

This enables grpc tests on python 3 and unifies the app engine and python 2.7 test suite (woohoo).

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Aug 17, 2016
Jon Wayne Parrott added 2 commits August 17, 2016 14:58
Change-Id: I6bf9a8acb9ba7d067b3095b5857094cbc322ff58
Change-Id: Ie0df6747050035b2ef5f937951d5ff955073e6d4
Change-Id: I0d3bdf3d6842339d04abc4ee6ddb26b8f44be3e5
@@ -70,7 +70,7 @@ def main(project_id, instance_id, table_id):
row = table.row(row_key)
row.set_cell(
column_family_id,
column_id.encode('utf-8'),
column_id,
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this have some six magic for python2 compatibility?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think Jon is just fixing a double encode? I think in general if you want Python strings as bytes, do the encode, no six necessary.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah cool. I totally didn't look at the context ^_^;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah fixing a double encode. No idea how this worked on py2.7 other than luck.

@waprin
Copy link
Contributor

waprin commented Aug 17, 2016

hooray. code lgtm. running it locally if you want to wait for that but I'm guessing any problems there will be doc issues anyway.



def pytest_ignore_collect(path, config):
"""Skip App Engine tests in python 3 and if no SDK is available."""
Copy link
Contributor

Choose a reason for hiding this comment

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

"and" -> "or"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@jerjou
Copy link
Contributor

jerjou commented Aug 17, 2016

LGTM if LGTTravis

Change-Id: I02a53961b6411247ef06d84dad7b533cb97d89f7
@theacodes
Copy link
Contributor Author

@dpebot merge when travis passes

@dpebot
Copy link
Collaborator

dpebot commented Aug 18, 2016

Okay! I'll merge when all statuses are green.

@dpebot dpebot added the automerge Merge the pull request once unit tests and other checks pass. label Aug 18, 2016
@dpebot dpebot merged commit 057b053 into master Aug 18, 2016
@dpebot dpebot deleted the fixup-nox branch August 18, 2016 17:17
telpirion pushed a commit that referenced this pull request Jan 13, 2023
Co-authored-by: AJ Morozoff <amorozoff@google.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
telpirion pushed a commit that referenced this pull request Jan 18, 2023
Source-Link: googleapis/synthtool@4760d8d
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:f0e4b51deef56bed74d3e2359c583fc104a8d6367da3984fc5c66938db738828

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
dandhlee pushed a commit that referenced this pull request Feb 6, 2023
Source-Link: googleapis/synthtool@4760d8d
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:f0e4b51deef56bed74d3e2359c583fc104a8d6367da3984fc5c66938db738828

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Sita04 pushed a commit that referenced this pull request Feb 7, 2023
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
dandhlee pushed a commit that referenced this pull request Feb 9, 2023
Co-authored-by: AJ Morozoff <amorozoff@google.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
telpirion pushed a commit that referenced this pull request Mar 13, 2023
Source-Link: googleapis/synthtool@4760d8d
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:f0e4b51deef56bed74d3e2359c583fc104a8d6367da3984fc5c66938db738828

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
telpirion pushed a commit that referenced this pull request Mar 13, 2023
Co-authored-by: AJ Morozoff <amorozoff@google.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge the pull request once unit tests and other checks pass. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants