Skip to content

Commit dfcf5f7

Browse files
BjoernAtBoschBjoernAtBosch
authored
Merge branch 'eclipse-velocitas:main' into erik_doc
2 parents db3f2cb + bb166e5 commit dfcf5f7

File tree

14 files changed

+260
-200
lines changed

14 files changed

+260
-200
lines changed

‎.github/workflows/release.yaml

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
1+
# Copyright (c) 2024 Contributors to the Eclipse Foundation
22
#
33
# This program and the accompanying materials are made available under the
44
# terms of the Apache License, Version 2.0 which is available at
@@ -12,56 +12,92 @@
1212
#
1313
# SPDX-License-Identifier: Apache-2.0
1414

15-
name: Release workflow
15+
name: Github Release and PyPi Publish
1616

1717
on:
18-
release:
19-
types: [published, edited]
18+
workflow_dispatch:
19+
push:
20+
tags:
21+
- "v*.*.*"
2022

2123
jobs:
22-
release-package:
23-
name: Generate package binaries
24-
runs-on: ubuntu-latest
24+
build:
25+
name: Build distribution 📦
26+
runs-on: ubuntu-22.04
2527

2628
steps:
27-
- name: Checkout repository
28-
uses: actions/checkout@v4
29+
- uses: actions/checkout@v4
30+
- name: Set up Python
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: "3.10"
34+
- name: Install pypa/build
35+
run: pip install build --user
36+
- name: Build a binary wheel and a source tarball
37+
run: python3 -m build
38+
- name: Store the distribution packages
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: python-package-distributions
42+
path: |
43+
dist/
44+
LICENSE
45+
NOTICE.md
2946
30-
- name: Initialize python
31-
uses: actions/setup-python@v5
32-
with:
33-
python-version: "3.10"
47+
publish-to-pypi:
48+
name: Publish 🐍 to PyPI
49+
needs:
50+
- build
51+
runs-on: ubuntu-22.04
52+
environment:
53+
name: pypi
54+
url: https://pypi.org/p/velocitas-sdk
3455

35-
- name: Install Dependencies
36-
run: |
37-
python3 -m pip install --upgrade pip
38-
python3 -m pip install -r requirements.txt
56+
permissions:
57+
id-token: write
3958

40-
- name: Set tags output
41-
id: vars
42-
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
43-
44-
- name: Check output
45-
env:
46-
RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
47-
run: |
48-
echo $RELEASE_VERSION
49-
echo ${{ steps.vars.outputs.tag }}
59+
steps:
60+
- name: Download dists folder
61+
uses: actions/download-artifact@v4
62+
with:
63+
name: python-package-distributions
64+
path: python-package/
65+
- name: Publish distribution 📦 to PyPI
66+
uses: pypa/gh-action-pypi-publish@release/v1
67+
with:
68+
packages-dir: python-package/dist
5069

51-
- name: Test setup.cfg execution
52-
run: |
53-
sed -i -e 's/@tag/${{ steps.vars.outputs.tag }}/g' ./setup.py
54-
python3 setup.py sdist
70+
github-release:
71+
name: >-
72+
Create GitHub Release
73+
needs:
74+
- build
75+
runs-on: ubuntu-22.04
5576

56-
- name: Upload artifacts
57-
uses: actions/upload-artifact@v4
58-
with:
59-
name: release
60-
path: ./dist
77+
permissions:
78+
contents: write
79+
id-token: write
6180

62-
- name: Upload assets
63-
uses: softprops/action-gh-release@v1
64-
if: startsWith(github.ref, 'refs/tags/')
65-
with:
66-
files: |
67-
./dist/*
81+
steps:
82+
- name: Download dists folder
83+
uses: actions/download-artifact@v4
84+
with:
85+
name: python-package-distributions
86+
path: python-package/
87+
- name: Sign the dists with Sigstore
88+
# If running on your own fork/organization
89+
# you must assure that sigstore has been added as authroized OAuth app in Github
90+
# Can be triggered by a manual run on CLI like "sigstore sign <somefile>"
91+
uses: sigstore/[email protected]
92+
with:
93+
inputs: >-
94+
./python-package/dist/*.tar.gz
95+
./python-package/dist/*.whl
96+
- name: Create release
97+
id: create_release
98+
uses: softprops/action-gh-release@v2
99+
with:
100+
files: |
101+
python-package/dist/**
102+
python-package/LICENSE
103+
python-package/NOTICE.md

‎.project-creation/.skeleton/requirements.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
# SPDX-License-Identifier: Apache-2.0
1414

15-
grpcio==1.59.0
16-
protobuf==4.24.4
17-
cloudevents==1.10.0
18-
aiohttp==3.9.3
15+
grpcio==1.64.1
16+
protobuf==5.27.2
17+
cloudevents==1.11.0
18+
aiohttp==3.10.5

‎.project-creation/.skeleton/requirements.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,35 @@
44
#
55
# pip-compile
66
#
7-
aiohttp==3.9.3
7+
aiohappyeyeballs==2.4.0
8+
# via aiohttp
9+
aiohttp==3.10.5
810
# via -r requirements.in
911
aiosignal==1.3.1
1012
# via aiohttp
1113
async-timeout==4.0.3
1214
# via aiohttp
13-
attrs==23.1.0
15+
attrs==24.2.0
1416
# via aiohttp
15-
cloudevents==1.10.0
17+
cloudevents==1.11.0
1618
# via -r requirements.in
1719
deprecation==2.1.0
1820
# via cloudevents
19-
frozenlist==1.4.0
21+
frozenlist==1.4.1
2022
# via
2123
# aiohttp
2224
# aiosignal
23-
grpcio==1.59.0
25+
grpcio==1.64.1
2426
# via -r requirements.in
25-
idna==3.4
27+
idna==3.8
2628
# via yarl
27-
multidict==6.0.4
29+
multidict==6.0.5
2830
# via
2931
# aiohttp
3032
# yarl
31-
packaging==23.2
33+
packaging==24.1
3234
# via deprecation
33-
protobuf==4.24.4
35+
protobuf==5.27.2
3436
# via -r requirements.in
35-
yarl==1.9.2
37+
yarl==1.9.7
3638
# via aiohttp

‎NOTICE-3RD-PARTY-CONTENT.md

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,78 @@
33
## Python
44
| Dependency | Version | License |
55
|:-----------|:-------:|--------:|
6-
|aiohttp|3.9.3|Apache 2.0|
6+
|aiohappyeyeballs|2.4.0|Other/Proprietary License<br/>Python Software Foundation License|
7+
|aiohttp|3.10.5|Apache 2.0|
78
|aiosignal|1.3.1|Apache 2.0|
89
|APScheduler|3.10.4|MIT|
910
|async-timeout|4.0.3|Apache 2.0|
10-
|attrs|23.1.0|MIT|
11-
|build|1.0.3|MIT|
12-
|cachetools|5.3.2|MIT|
11+
|attrs|24.2.0|MIT|
12+
|build|1.2.1|MIT|
13+
|cachetools|5.5.0|MIT|
1314
|cfgv|3.4.0|MIT|
1415
|chardet|5.2.0|LGPL|
1516
|click|8.1.7|New BSD|
16-
|cloudevents|1.10.1|Apache 2.0|
17+
|cloudevents|1.11.0|Apache 2.0|
1718
|colorama|0.4.6|BSD|
18-
|coverage|7.4.1|Apache 2.0|
19+
|coverage|7.6.1|Apache 2.0|
1920
|Deprecated|1.2.14|MIT|
2021
|deprecation|2.1.0|Apache 2.0|
2122
|distlib|0.3.8|Python Software Foundation License|
22-
|exceptiongroup|1.2.0|MIT|
23-
|filelock|3.13.1|The Unlicense (Unlicense)|
24-
|frozenlist|1.4.0|Apache 2.0|
23+
|exceptiongroup|1.2.2|MIT|
24+
|filelock|3.15.4|The Unlicense (Unlicense)|
25+
|frozenlist|1.4.1|Apache 2.0|
2526
|grpc-stubs|1.53.0.5|MIT|
26-
|grpcio|1.59.0|Apache 2.0|
27-
|grpcio-tools|1.59.0|Apache 2.0|
28-
|identify|2.5.33|MIT|
29-
|idna|3.4|BSD|
27+
|grpcio|1.64.1|Apache 2.0|
28+
|grpcio-tools|1.64.1|Apache 2.0|
29+
|identify|2.6.0|MIT|
30+
|idna|3.8|BSD|
31+
|importlib-metadata|7.1.0|Apache 2.0|
3032
|iniconfig|2.0.0|MIT|
31-
|multidict|6.0.4|Apache 2.0|
32-
|mypy|1.8.0|MIT|
33+
|multidict|6.0.5|Apache 2.0|
34+
|mypy|1.11.2|MIT|
3335
|mypy-extensions|1.0.0|MIT|
34-
|mypy-protobuf|3.4.0|Apache 2.0|
35-
|nodeenv|1.8.0|BSD|
36-
|opentelemetry-api|1.15.0|Apache 2.0|
37-
|opentelemetry-distro|0.36b0|Apache 2.0|
38-
|opentelemetry-instrumentation|0.36b0|Apache 2.0|
39-
|opentelemetry-instrumentation-logging|0.36b0|Apache 2.0|
40-
|opentelemetry-sdk|1.15.0|Apache 2.0|
41-
|opentelemetry-semantic-conventions|0.36b0|Apache 2.0|
42-
|packaging|23.1|Apache 2.0<br/>BSD|
43-
|paho-mqtt|1.6.1|OSI Approved|
36+
|mypy-protobuf|3.6.0|Apache 2.0|
37+
|nodeenv|1.9.1|BSD|
38+
|opentelemetry-api|1.25.0|Apache 2.0|
39+
|opentelemetry-distro|0.46b0|Apache 2.0|
40+
|opentelemetry-instrumentation|0.46b0|Apache 2.0|
41+
|opentelemetry-instrumentation-logging|0.46b0|Apache 2.0|
42+
|opentelemetry-sdk|1.25.0|Apache 2.0|
43+
|opentelemetry-semantic-conventions|0.46b0|Apache 2.0|
44+
|packaging|24.1|Apache 2.0<br/>BSD|
45+
|paho-mqtt|2.1.0|OSI Approved|
4446
|pip|23.0.1|MIT|
45-
|pip-tools|7.3.0|BSD|
46-
|platformdirs|4.2.0|MIT|
47-
|pluggy|1.4.0|MIT|
48-
|pre-commit|3.6.0|MIT|
49-
|protobuf|4.21.12|Google License|
50-
|pyproject-api|1.6.1|MIT|
51-
|pyproject-hooks|1.0.0|MIT|
52-
|pytest|7.4.4|MIT|
53-
|pytest-asyncio|0.23.4|Apache 2.0|
54-
|pytest-cov|4.1.0|MIT|
47+
|pip-tools|7.4.1|BSD|
48+
|platformdirs|4.2.2|MIT|
49+
|pluggy|1.5.0|MIT|
50+
|pre-commit|3.8.0|MIT|
51+
|protobuf|5.27.2|Google License|
52+
|pyproject-api|1.7.1|MIT|
53+
|pyproject-hooks|1.1.0|MIT|
54+
|pytest|8.3.2|MIT|
55+
|pytest-asyncio|0.24.0|Apache 2.0|
56+
|pytest-cov|5.0.0|MIT|
5557
|pytz|2024.1|MIT|
56-
|PyYAML|6.0.1|MIT|
58+
|PyYAML|6.0.2|MIT|
5759
|setuptools|65.5.1|MIT|
5860
|six|1.16.0|MIT|
5961
|tomli|2.0.1|MIT|
60-
|tox|4.11.4|MIT|
61-
|types-Deprecated|1.2.9.20240106|Apache 2.0|
62-
|types-mock|5.1.0.20240106|Apache 2.0|
63-
|types-protobuf|4.24.0.20240129|Apache 2.0|
64-
|typing-extensions|4.7.1|Python Software Foundation License|
62+
|tox|4.18.0|MIT|
63+
|types-Deprecated|1.2.9.20240311|Apache 2.0|
64+
|types-mock|5.1.0.20240425|Apache 2.0|
65+
|types-protobuf|5.27.0.20240626|Apache 2.0|
66+
|typing-extensions|4.12.2|Python Software Foundation License|
6567
|tzlocal|5.2|MIT|
66-
|virtualenv|20.25.0|MIT|
67-
|wheel|0.42.0|MIT|
68-
|wrapt|1.15.0|BSD|
69-
|yarl|1.9.2|Apache 2.0|
68+
|virtualenv|20.26.3|MIT|
69+
|wheel|0.44.0|MIT|
70+
|wrapt|1.16.0|BSD|
71+
|yarl|1.9.7|Apache 2.0|
72+
|zipp|3.20.1|MIT|
7073
## Workflows
7174
| Dependency | Version | License |
7275
|:-----------|:-------:|--------:|
7376
|actions/checkout|v4|MIT License|
77+
|actions/download-artifact|v4|MIT License|
7478
|actions/setup-java|v4|MIT License|
7579
|actions/setup-node|v4|MIT License|
7680
|actions/setup-python|v5|MIT License|
@@ -80,4 +84,6 @@
8084
|github/codeql-action|v3|MIT License|
8185
|mikepenz/action-junit-report|v4|Apache License 2.0|
8286
|pre-commit/action|v3.0.1|MIT License|
83-
|softprops/action-gh-release|v1|MIT License|
87+
|pypa/gh-action-pypi-publish|release/v1|BSD 3-Clause "New" or "Revised" License|
88+
|sigstore/gh-action-sigstore-python|v3.0.0|Apache License 2.0|
89+
|softprops/action-gh-release|v2|MIT License|

‎examples/seat-adjuster/requirements.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#
1313
# SPDX-License-Identifier: Apache-2.0
1414

15-
grpcio==1.59.0
16-
protobuf==4.24.4
17-
cloudevents==1.10.0
18-
aiohttp==3.9.3
19-
packaging==23.0
15+
grpcio==1.64.1
16+
protobuf==5.27.2
17+
cloudevents==1.11.0
18+
aiohttp==3.10.5
19+
packaging==24.1

‎examples/seat-adjuster/requirements.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,37 @@
44
#
55
# pip-compile
66
#
7-
aiohttp==3.9.3
7+
aiohappyeyeballs==2.4.0
8+
# via aiohttp
9+
aiohttp==3.10.5
810
# via -r requirements.in
911
aiosignal==1.3.1
1012
# via aiohttp
1113
async-timeout==4.0.3
1214
# via aiohttp
13-
attrs==23.1.0
15+
attrs==24.2.0
1416
# via aiohttp
15-
cloudevents==1.10.0
17+
cloudevents==1.11.0
1618
# via -r requirements.in
1719
deprecation==2.1.0
1820
# via cloudevents
19-
frozenlist==1.4.0
21+
frozenlist==1.4.1
2022
# via
2123
# aiohttp
2224
# aiosignal
23-
grpcio==1.59.0
25+
grpcio==1.64.1
2426
# via -r requirements.in
25-
idna==3.4
27+
idna==3.8
2628
# via yarl
27-
multidict==6.0.4
29+
multidict==6.0.5
2830
# via
2931
# aiohttp
3032
# yarl
31-
packaging==23.0
33+
packaging==24.1
3234
# via
3335
# -r requirements.in
3436
# deprecation
35-
protobuf==4.24.4
37+
protobuf==5.27.2
3638
# via -r requirements.in
37-
yarl==1.9.2
39+
yarl==1.9.7
3840
# via aiohttp

‎examples/seat-adjuster/tests/requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ pytest-ordering
1717
pytest-asyncio
1818
pytest-cov
1919
types-mock
20-
packaging==23.0

0 commit comments

Comments
 (0)