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

Python 3.12 and Update GHAs [minor] #63

Merged
merged 9 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- checkout
- run: dockerize -wait tcp://localhost:5672 -timeout 1m
- run: |
pip install -r requirements.txt
pip install .
pip install pika
./examples/wipac_tracing/run_all_examples.sh

Expand Down
31 changes: 19 additions & 12 deletions .github/workflows/wipac-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ on: [push]

jobs:

py-versions:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.versions.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- id: versions
uses: WIPACrepo/wipac-dev-py-versions-action@v2.1

flake8:
runs-on: ubuntu-latest
steps:
Expand All @@ -16,11 +25,18 @@ jobs:
- uses: WIPACrepo/wipac-dev-flake8-action@v1.0

mypy:
needs: [py-versions]
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: WIPACrepo/wipac-dev-mypy-action@v1.1
with:
python-version: ${{ matrix.py3 }}
- uses: WIPACrepo/wipac-dev-mypy-action@v2.0

py-setup:
runs-on: ubuntu-latest
Expand All @@ -42,19 +58,10 @@ jobs:
github.ref_type == 'branch' &&
format('refs/heads/{0}', github.event.repository.default_branch) != github.ref
name: wipac-dev-py-setup-action (only for non-dependabot non-default branches)
uses: WIPACrepo/wipac-dev-py-setup-action@v1.12
uses: WIPACrepo/wipac-dev-py-setup-action@v2.6
with:
base-keywords: "WIPAC IceCube"

py-versions:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.versions.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- id: versions
uses: WIPACrepo/wipac-dev-py-versions-action@v2.1

pip-install:
# FUTURE DEV: this can be expanded to run actual tests instead of just pip installing
needs: [py-versions]
Expand Down Expand Up @@ -82,7 +89,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: python-semantic-release/python-semantic-release@master
- uses: python-semantic-release/python-semantic-release@v7.34.6
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
repository_username: __token__
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,7 @@ dmypy.json

# project specifics
/examples/telemetry-server/example-data/tempo


# wipac-dev-py-setup-action
!dependencies*.log
134 changes: 134 additions & 0 deletions dependencies-dev.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --extra=dev --output-file=dependencies-dev.log
#
backoff==1.10.0
# via
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
certifi==2023.7.22
# via requests
charset-normalizer==3.3.0
# via requests
coloredlogs==15.0.1
# via wipac-telemetry (setup.py)
deprecated==1.2.14
# via
# opentelemetry-api
# opentelemetry-propagator-b3
googleapis-common-protos==1.56.2
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
grpcio==1.59.0
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-otlp-proto-grpc
humanfriendly==10.0
# via coloredlogs
idna==3.4
# via requests
importlib-metadata==6.8.0
# via opentelemetry-api
opentelemetry-api==1.20.0
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-jaeger-thrift
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-instrumentation
# opentelemetry-instrumentation-flask
# opentelemetry-instrumentation-requests
# opentelemetry-instrumentation-wsgi
# opentelemetry-propagator-b3
# opentelemetry-sdk
# wipac-telemetry (setup.py)
opentelemetry-exporter-jaeger==1.20.0
# via wipac-telemetry (setup.py)
opentelemetry-exporter-jaeger-proto-grpc==1.20.0
# via opentelemetry-exporter-jaeger
opentelemetry-exporter-jaeger-thrift==1.20.0
# via opentelemetry-exporter-jaeger
opentelemetry-exporter-otlp==1.6.2
# via wipac-telemetry (setup.py)
opentelemetry-exporter-otlp-proto-grpc==1.6.2
# via
# opentelemetry-exporter-otlp
# wipac-telemetry (setup.py)
opentelemetry-exporter-otlp-proto-http==1.6.2
# via
# opentelemetry-exporter-otlp
# wipac-telemetry (setup.py)
opentelemetry-instrumentation==0.41b0
# via
# opentelemetry-instrumentation-flask
# opentelemetry-instrumentation-requests
# opentelemetry-instrumentation-wsgi
opentelemetry-instrumentation-flask==0.41b0
# via wipac-telemetry (setup.py)
opentelemetry-instrumentation-requests==0.41b0
# via wipac-telemetry (setup.py)
opentelemetry-instrumentation-wsgi==0.41b0
# via opentelemetry-instrumentation-flask
opentelemetry-propagator-b3==1.6.2
# via wipac-telemetry (setup.py)
opentelemetry-proto==1.6.2
# via
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
opentelemetry-sdk==1.20.0
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-jaeger-thrift
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
# wipac-telemetry (setup.py)
opentelemetry-semantic-conventions==0.41b0
# via
# opentelemetry-instrumentation-flask
# opentelemetry-instrumentation-requests
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
opentelemetry-util-http==0.41b0
# via
# opentelemetry-instrumentation-flask
# opentelemetry-instrumentation-requests
# opentelemetry-instrumentation-wsgi
packaging==23.2
# via opentelemetry-instrumentation-flask
pika==1.3.2
# via wipac-telemetry (setup.py)
protobuf==3.20.3
# via
# googleapis-common-protos
# opentelemetry-proto
# wipac-telemetry (setup.py)
requests==2.31.0
# via
# opentelemetry-exporter-otlp-proto-http
# wipac-dev-tools
six==1.16.0
# via thrift
thrift==0.16.0
# via opentelemetry-exporter-jaeger-thrift
typing-extensions==4.8.0
# via
# opentelemetry-sdk
# wipac-dev-tools
# wipac-telemetry (setup.py)
urllib3==2.0.6
# via requests
wipac-dev-tools==1.7.0
# via wipac-telemetry (setup.py)
wrapt==1.15.0
# via
# deprecated
# opentelemetry-instrumentation
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
57 changes: 31 additions & 26 deletions requirements.txt → dependencies.log
Original file line number Diff line number Diff line change
@@ -1,82 +1,87 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile
# pip-compile --output-file=dependencies.log
#
backoff==2.2.1
# via opentelemetry-exporter-otlp-proto-http
certifi==2022.12.7
# via
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-http
certifi==2023.7.22
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.3.0
# via requests
coloredlogs==15.0.1
# via wipac-telemetry (setup.py)
deprecated==1.2.13
# via opentelemetry-api
deprecated==1.2.14
# via
# opentelemetry-api
# opentelemetry-exporter-otlp-proto-http
googleapis-common-protos==1.56.2
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-otlp-proto-http
grpcio==1.53.0
grpcio==1.59.0
# via opentelemetry-exporter-jaeger-proto-grpc
humanfriendly==10.0
# via coloredlogs
idna==3.4
# via requests
importlib-metadata==6.0.1
importlib-metadata==6.8.0
# via opentelemetry-api
opentelemetry-api==1.17.0
opentelemetry-api==1.20.0
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-jaeger-thrift
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-sdk
# wipac-telemetry (setup.py)
opentelemetry-exporter-jaeger==1.17.0
opentelemetry-exporter-jaeger==1.20.0
# via wipac-telemetry (setup.py)
opentelemetry-exporter-jaeger-proto-grpc==1.17.0
opentelemetry-exporter-jaeger-proto-grpc==1.20.0
# via opentelemetry-exporter-jaeger
opentelemetry-exporter-jaeger-thrift==1.17.0
opentelemetry-exporter-jaeger-thrift==1.20.0
# via opentelemetry-exporter-jaeger
opentelemetry-exporter-otlp-proto-http==1.17.0
# via wipac-telemetry (setup.py)
opentelemetry-proto==1.17.0
opentelemetry-exporter-otlp-proto-common==1.20.0
# via opentelemetry-exporter-otlp-proto-http
opentelemetry-sdk==1.17.0
opentelemetry-exporter-otlp-proto-http==1.20.0
# via wipac-telemetry (setup.py)
opentelemetry-proto==1.20.0
# via
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-http
opentelemetry-sdk==1.20.0
# via
# opentelemetry-exporter-jaeger-proto-grpc
# opentelemetry-exporter-jaeger-thrift
# opentelemetry-exporter-otlp-proto-http
# wipac-telemetry (setup.py)
opentelemetry-semantic-conventions==0.38b0
opentelemetry-semantic-conventions==0.41b0
# via opentelemetry-sdk
protobuf==3.20.3
# via
# googleapis-common-protos
# opentelemetry-proto
# wipac-telemetry (setup.py)
requests==2.28.2
requests==2.31.0
# via
# opentelemetry-exporter-otlp-proto-http
# wipac-dev-tools
six==1.16.0
# via thrift
thrift==0.16.0
# via opentelemetry-exporter-jaeger-thrift
typing-extensions==4.5.0
typing-extensions==4.8.0
# via
# opentelemetry-sdk
# wipac-dev-tools
# wipac-telemetry (setup.py)
urllib3==1.26.15
urllib3==2.0.6
# via requests
wipac-dev-tools==1.6.13
wipac-dev-tools==1.7.0
# via wipac-telemetry (setup.py)
wrapt==1.15.0
# via deprecated
zipp==3.15.0
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
6 changes: 0 additions & 6 deletions requirements-dev.txt

This file was deleted.

Loading
Loading