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

TCN-548 Fix Python CI syntax error #675

Merged
merged 10 commits into from
Oct 17, 2022
Merged

TCN-548 Fix Python CI syntax error #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a0af8d3
fix syntax error
elliotmjackson Oct 14, 2022
a297c60
fix syntax error
elliotmjackson Oct 14, 2022
ee29658
fix syntax error
elliotmjackson Oct 14, 2022
be7efdb
Merge branch 'main' into ejackson/tcn-548-python-ci-not-working
elliotmjackson Oct 17, 2022
6897b28
Merge branch 'main' into ejackson/tcn-548-python-ci-not-working
elliotmjackson Oct 17, 2022
39651de
upgrade pyproject.toml to include scm
elliotmjackson Oct 17, 2022
58456c8
test python build with passed in version
elliotmjackson Oct 17, 2022
577fb9c
upgrade pyproject.toml to include scm
elliotmjackson Oct 17, 2022
d2712b5
run only on tag
elliotmjackson Oct 17, 2022
54f887c
Apply suggestions from code review
elliotmjackson Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

env:
IMAGE_TAG: protoc-gen-validate:${{ github.sha }}
REF_NAME: ${{ github.ref_name }}
Copy link
Member

Choose a reason for hiding this comment

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

Can we just use ${{ github.ref_name }} below? I'm not sure what the indirection buys us.


jobs:
deploy:
Expand All @@ -25,9 +26,8 @@ jobs:
load: true
push: false
tags: ${{ env.IMAGE_TAG }}
- name: Run
- run: |
docker run --rm \
--env PYPI_REPO=pypi \
--env PGV_PYPI_TOKEN="${{ secrets.PGV_PYPI_TOKEN }}" \
${{ env.IMAGE_TAG }} python-release
${{ env.IMAGE_TAG }} SETUPTOOLS_SCM_PRETEND_VERSION=${{ env.REF_NAME }} python-release
4 changes: 3 additions & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[build-system]
requires = [
"setuptools>=42",
"setuptools>=45",
"setuptools_scm[toml]>=6.2",
"wheel"
]
build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
8 changes: 4 additions & 4 deletions python/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[metadata]
name = protoc-gen-validate
version = 0.4.2
author = Envoyproxy
author_email = dev@lyft.com
version = env: SETUPTOOLS_SCM_PRETEND_VERSION
author = Buf
author_email = dev@buf.build
description = PGV for python via just-in-time code generation
long_description = file: README.md
long_description_content_type = text/markdown
url = https://github.com/envoyproxy/protoc-gen-validate
url = https://github.com/bufbuild/protoc-gen-validate
license_files = LICENSE
classifiers =
Programming Language :: Python :: 3
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ isort==5.7.0
build==0.3.0
twine==3.3.0
wheel==0.36.2
setuptools==53.0.0
protobuf==3.20.2
setuptools==65.5.0
protobuf==3.20.2
setuptools_scm[toml]>=6.2