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

Revert "Remove deprecated service.py usages from test". For 29.x only #19434

Merged
merged 1 commit into from
Nov 27, 2024

Conversation

anandolee
Copy link
Contributor

@anandolee anandolee commented Nov 27, 2024

This reverts commit 471ff77.

Add the service test back and fix indent issue only for 29.x for #19430

@anandolee anandolee requested a review from a team as a code owner November 27, 2024 22:07
@anandolee anandolee requested review from ericsalo and mkruskal-google and removed request for a team November 27, 2024 22:07
Copy link
Member

@shaod2 shaod2 left a comment

Choose a reason for hiding this comment

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

We should probably make this change in Piper and let copybara do the job

@mkruskal-google
Copy link
Member

This file is deleted in piper :P

@anandolee anandolee enabled auto-merge (squash) November 27, 2024 22:14
@mkruskal-google mkruskal-google added the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Nov 27, 2024
@github-actions github-actions bot removed the 🅰️ safe for tests Mark a commit as safe to run presubmits over label Nov 27, 2024
@zhangskz
Copy link
Member

This file is deleted in piper :P

Clarification: This is deleted in main (for 30.x), but we're rolling this back for just the 29.x branch.

@anandolee anandolee merged commit 5864b50 into protocolbuffers:29.x Nov 27, 2024
175 of 177 checks passed
hswong3i added a commit to alvistack/protocolbuffers-protobuf that referenced this pull request Nov 28, 2024
    git clean -xdf
    git submodule sync --recursive
    git submodule update --init --recursive
    git submodule foreach git checkout -- .
    tar zcvf ../protobuf_5.29.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp protobuf.spec ../protobuf_5.29.0-1.spec
    cp ../*protobuf*5.29.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    cp _constraints /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    rm -rf ../*proto*5.29.0*.*

See protocolbuffers#19434

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/protocolbuffers-protobuf that referenced this pull request Nov 28, 2024
    git clean -xdf
    git submodule sync --recursive
    git submodule update --init --recursive
    git submodule foreach git checkout -- .
    tar zcvf ../protobuf_5.29.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp protobuf.spec ../protobuf_5.29.0-1.spec
    cp ../*protobuf*5.29.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    cp _constraints /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    rm -rf ../*proto*5.29.0*.*

See protocolbuffers#19434

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/protocolbuffers-protobuf that referenced this pull request Nov 28, 2024
    git clean -xdf
    git submodule sync --recursive
    git submodule update --init --recursive
    git submodule foreach git checkout -- .
    tar zcvf ../protobuf_5.29.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp protobuf.spec ../protobuf_5.29.0-1.spec
    cp ../*protobuf*5.29.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    cp _constraints /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    rm -rf ../*proto*5.29.0*.*

See protocolbuffers#19434

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/protocolbuffers-protobuf that referenced this pull request Nov 29, 2024
    git clean -xdf
    git submodule sync --recursive
    git submodule update --init --recursive
    git submodule foreach git checkout -- .
    tar zcvf ../protobuf_5.29.0.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp protobuf.spec ../protobuf_5.29.0-1.spec
    cp ../*protobuf*5.29.0*.{gz,xz,spec,dsc} /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    cp _constraints /osc/home\:alvistack/protocolbuffers-protobuf-5.29.0/
    rm -rf ../*proto*5.29.0*.*

See protocolbuffers#19434

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
"""
raise NotImplementedError
raise NotImplementedError
Copy link

Choose a reason for hiding this comment

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

This is causing the following fatal error in protobuf==5.29.0:

IndentationError: unindent does not match any outer indentation level (service.py, line 78)

hswong3i added a commit to alvistack/protocolbuffers-protobuf that referenced this pull request Dec 5, 2024
    git clean -xdf
    git submodule sync --recursive
    git submodule update --init --recursive
    git submodule foreach git checkout -- .
    tar zcvf ../protobuf_5.29.1.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp protobuf.spec ../protobuf_5.29.1-1.spec
    cp ../*protobuf*5.29.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/protocolbuffers-protobuf-5.29.1/
    cp _constraints /osc/home\:alvistack/protocolbuffers-protobuf-5.29.1/
    rm -rf ../*proto*5.29.1*.*

See protocolbuffers#19434

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
hswong3i added a commit to alvistack/protocolbuffers-protobuf that referenced this pull request Dec 20, 2024
    git clean -xdf
    git submodule sync --recursive
    git submodule update --init --recursive
    git submodule foreach git checkout -- .
    tar zcvf ../protobuf_5.29.2.orig.tar.gz --exclude=.git .
    debuild -uc -us
    cp protobuf.spec ../protobuf_5.29.2-1.spec
    cp ../*protobuf*5.29.2*.{gz,xz,spec,dsc} /osc/home\:alvistack/protocolbuffers-protobuf-5.29.2/
    cp _constraints /osc/home\:alvistack/protocolbuffers-protobuf-5.29.2/
    rm -rf ../*proto*5.29.2*.*

See protocolbuffers#19434

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants