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

bump uwsgi to 2.0.26 + Python to 3.12.3 #4495

Merged
merged 20 commits into from
Jun 10, 2024
Merged

Conversation

joeyorlando
Copy link
Contributor

@joeyorlando joeyorlando commented Jun 10, 2024

What this PR does

Which issue(s) this PR closes

Closes #4358
Closes #4387

@joeyorlando joeyorlando added pr:no public docs Added to a PR that does not require public documentation updates release:patch PR will be added to "Other Changes" section of release notes labels Jun 10, 2024
@joeyorlando joeyorlando requested a review from a team June 10, 2024 14:17
@joeyorlando joeyorlando changed the title bump uwsgi to 2.0.26 bump uwsgi to 2.0.26 + Python to 3.12.4 Jun 10, 2024
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: "3.11.4"
Copy link
Contributor Author

@joeyorlando joeyorlando Jun 10, 2024

Choose a reason for hiding this comment

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

decided to refactor this action file, because of this line.. now we only have our backend Python version defined in one location for our GitHub Actions workflows, here in .github/actions/setup-python/action.yml

see renamed .github/workflows/snyk-security-scan.yml file above ☝️

@@ -18,13 +18,13 @@ RUN apk add bash \

WORKDIR /etc/app
COPY ./requirements.txt ./
COPY ./grpcio-1.57.0-cp311-cp311-linux_aarch64.whl ./
COPY ./grpcio-1.64.1-cp312-cp312-manylinux_2_17_aarch64.whl ./
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the grpcio==1.57.0 package doesn't have any distributions built for Python 3.12 (pypi files available for 1.57.0).. so therefore decided to bump this to latest version available.

@@ -142,7 +142,7 @@ def delete_thread_message_from_resolution_note(

STEPS_ROUTING: ScenarioRoute.RoutingSteps = [
typing.cast(
ScenarioRoute.EventCallbackChannelMessageScenarioRoute,
ScenarioRoute.EventCallbackScenarioRoute,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

see note here

@joeyorlando joeyorlando changed the title bump uwsgi to 2.0.26 + Python to 3.12.4 bump uwsgi to 2.0.26 + Python to 3.12.3 Jun 10, 2024
@joeyorlando joeyorlando changed the title bump uwsgi to 2.0.26 + Python to 3.12.3 bump uwsgi to 2.0.26 + Python to 3.12.3 Jun 10, 2024
Comment on lines +39 to +45
opentelemetry-sdk==1.25.0
opentelemetry-api==1.25.0
opentelemetry-exporter-otlp-proto-grpc==1.25.0
opentelemetry-instrumentation-logging==0.46b0
opentelemetry-instrumentation-wsgi==0.46b0
opentelemetry-instrumentation-requests==0.46b0
opentelemetry-instrumentation-django==0.46b0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the opentelemetry packages weren't working on 3.12 so bumped them to a newer version

https://github.com/grafana/oncall/actions/runs/9451161174/job/26031450875?pr=4495#step:5:24

@@ -0,0 +1 @@
*.whl filter=lfs diff=lfs merge=lfs -text
Copy link
Contributor Author

@joeyorlando joeyorlando Jun 10, 2024

Choose a reason for hiding this comment

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

needed for this, otherwise when trying to commit the new .whl file, I ended up with this:

❯ git push origin jorlando/update-uwsgi-version
Uploading LFS objects: 100% (1/1), 113 MB | 0 B/s, done.
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 10 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (10/10), 107.23 MiB | 17.12 MiB/s, done.
Total 10 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (5/5), completed with 3 local objects.
remote: error: Trace: 015ee68316c493da0756d3d6e06c403ad8d97b15f1496100acff905654bed8d2
remote: error: See https://gh.io/lfs for more information.
remote: error: File engine/grpcio-1.64.1-cp312-cp312-linux_aarch64.whl is 107.75 MB; this exceeds GitHub's file size limit of 100.00 MB
remote: error: GH001: Large files detected. You may want to try Git Large File Storage - https://git-lfs.github.com.
To github.com:grafana/oncall.git
 ! [remote rejected]   jorlando/update-uwsgi-version -> jorlando/update-uwsgi-version (pre-receive hook declined)
error: failed to push some refs to 'github.com:grafana/oncall.git'

@joeyorlando joeyorlando force-pushed the jorlando/update-uwsgi-version branch from 4352d99 to bbfeb3e Compare June 10, 2024 17:58
Copy link
Contributor Author

Choose a reason for hiding this comment

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

WARN[0002] /Users/joeyorlando/coding/grafana/oncall/docker-compose-developer.yml: `version` is obsolete

@joeyorlando joeyorlando merged commit 49d20f1 into dev Jun 10, 2024
21 checks passed
@joeyorlando joeyorlando deleted the jorlando/update-uwsgi-version branch June 10, 2024 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:no public docs Added to a PR that does not require public documentation updates release:patch PR will be added to "Other Changes" section of release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CVEs found in Grafana/Oncall:v1.5.1 Upgrade uwsgi to 2.0.25
1 participant