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

Upgrade direct Python dependencies (#6511) #6649

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from

Conversation

achave11-ucsc
Copy link
Member

@achave11-ucsc achave11-ucsc commented Oct 23, 2024

Connected issues: #6511

Checklist

Author

  • PR is a draft
  • Target branch is develop
  • Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
  • On ZenHub, PR is connected to all issues it (partially) resolves
  • PR description links to connected issues
  • PR title matches1 that of a connected issue or comment in PR explains why they're different
  • PR title references all connected issues
  • For each connected issue, there is at least one commit whose title references that issue

1 when the issue title describes a problem, the corresponding PR
title is Fix: followed by the issue title

Author (partiality)

  • Added p tag to titles of partial commits
  • This PR is labeled partial or completely resolves all connected issues
  • This PR partially resolves each of the connected issues or does not have the partial label

Author (chains)

  • This PR is blocked by previous PR in the chain or is not chained to another PR
  • The blocking PR is labeled base or this PR is not chained to another PR
  • This PR is labeled chained or is not chained to another PR

Author (reindex, API changes)

  • Added r tag to commit title or the changes introduced by this PR will not require reindexing of any deployment
  • This PR is labeled reindex:dev or the changes introduced by it will not require reindexing of dev
  • This PR is labeled reindex:anvildev or the changes introduced by it will not require reindexing of anvildev
  • This PR is labeled reindex:anvilprod or the changes introduced by it will not require reindexing of anvilprod
  • This PR is labeled reindex:prod or the changes introduced by it will not require reindexing of prod
  • This PR is labeled reindex:partial and its description documents the specific reindexing procedure for dev, anvildev, anvilprod and prod or requires a full reindex or carries none of the labels reindex:dev, reindex:anvildev, reindex:anvilprod and reindex:prod
  • This PR and its connected issues are labeled API or this PR does not modify a REST API
  • Added a (A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST API
  • Updated REST API version number in app.py or this PR does not modify a REST API

Author (upgrading deployments)

  • Ran make docker_images.json and committed the resulting changes or this PR does not modify azul_docker_images, or any other variables referenced in the definition of that variable
  • Documented upgrading of deployments in UPGRADING.rst or this PR does not require upgrading deployments
  • Added u tag to commit title or this PR does not require upgrading deployments
  • This PR is labeled upgrade or does not require upgrading deployments
  • This PR is labeled deploy:shared or does not modify docker_images.json, and does not require deploying the shared component for any other reason
  • This PR is labeled deploy:gitlab or does not require deploying the gitlab component
  • This PR is labeled deploy:runner or does not require deploying the runner image

Author (hotfixes)

  • Added F tag to main commit title or this PR does not include permanent fix for a temporary hotfix
  • Reverted the temporary hotfixes for any connected issues or the none of the stable branches (anvilprod and prod) have temporary hotfixes for any of the issues connected to this PR

Author (before every review)

  • Rebased PR branch on develop, squashed old fixups
  • Ran make requirements_update or this PR does not modify requirements*.txt, common.mk, Makefile and Dockerfile
  • Added R tag to commit title or this PR does not modify requirements*.txt
  • This PR is labeled reqs or does not modify requirements*.txt
  • make integration_test passes in personal deployment or this PR does not modify functionality that could affect the IT outcome

Peer reviewer (after approval)

  • PR is not a draft
  • Ticket is in Review requested column
  • PR is awaiting requested review from system administrator
  • PR is assigned to only the system administrator

System administrator (after approval)

  • Actually approved the PR
  • Labeled connected issues as demo or no demo
  • Commented on connected issues about demo expectations or all connected issues are labeled no demo
  • Decided if PR can be labeled no sandbox
  • A comment to this PR details the completed security design review
  • PR title is appropriate as title of merge commit
  • N reviews label is accurate
  • Moved connected issues to Approved column
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Checked reindex:… labels and r commit title tag
  • Checked that demo expectations are clear or all connected issues are labeled no demo
  • Squashed PR branch and rebased onto develop
  • Sanity-checked history
  • Pushed PR branch to GitHub
  • Ran _select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Ran _select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Checked the items in the next section or this PR is labeled deploy:gitlab
  • PR is assigned to only the system administrator or this PR is not labeled deploy:gitlab

System administrator

  • Background migrations for dev.gitlab are complete or this PR is not labeled deploy:gitlab
  • Background migrations for anvildev.gitlab are complete or this PR is not labeled deploy:gitlab
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Ran _select dev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Ran _select anvildev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Added sandbox label or PR is labeled no sandbox
  • Pushed PR branch to GitLab dev or PR is labeled no sandbox
  • Pushed PR branch to GitLab anvildev or PR is labeled no sandbox
  • Build passes in sandbox deployment or PR is labeled no sandbox
  • Build passes in anvilbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in sandbox deployment or PR is labeled no sandbox
  • Reviewed build logs for anomalies in anvilbox deployment or PR is labeled no sandbox
  • Deleted unreferenced indices in sandbox or this PR does not remove catalogs or otherwise causes unreferenced indices in dev
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices in anvildev
  • Started reindex in sandbox or this PR is not labeled reindex:dev
  • Started reindex in anvilbox or this PR is not labeled reindex:anvildev
  • Checked for failures in sandbox or this PR is not labeled reindex:dev
  • Checked for failures in anvilbox or this PR is not labeled reindex:anvildev
  • The title of the merge commit starts with the title of this PR
  • Added PR # reference to merge commit title
  • Collected commit title tags in merge commit title but only included p if the PR is also labeled partial
  • Moved connected issues to Merged lower column in ZenHub
  • Moved blocked issues to Triage or no issues are blocked on the connected issues
  • Pushed merge commit to GitHub

Operator (chain shortening)

  • Changed the target branch of the blocked PR to develop or this PR is not labeled base
  • Removed the chained label from the blocked PR or this PR is not labeled base
  • Removed the blocking relationship from the blocked PR or this PR is not labeled base
  • Removed the base label from this PR or this PR is not labeled base

Operator (after pushing the merge commit)

  • Pushed merge commit to GitLab dev
  • Pushed merge commit to GitLab anvildev
  • Build passes on GitLab dev
  • Reviewed build logs for anomalies on GitLab dev
  • Build passes on GitLab anvildev
  • Reviewed build logs for anomalies on GitLab anvildev
  • Ran _select dev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Ran _select anvildev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Deleted PR branch from GitHub
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev

Operator (reindex)

  • Deindexed all unreferenced catalogs in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed all unreferenced catalogs in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Deindexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Indexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Indexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Started reindex in dev or this PR does not require reindexing dev
  • Started reindex in anvildev or this PR does not require reindexing anvildev
  • Checked for, triaged and possibly requeued messages in both fail queues in dev or this PR does not require reindexing dev
  • Checked for, triaged and possibly requeued messages in both fail queues in anvildev or this PR does not require reindexing anvildev
  • Emptied fail queues in dev or this PR does not require reindexing dev
  • Emptied fail queues in anvildev or this PR does not require reindexing anvildev

Operator

  • Propagated the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels to the next promotion PRs or this PR carries none of these labels
  • Propagated any specific instructions related to the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labels
  • PR is assigned to no one

Shorthand for review comments

  • L line is too long
  • W line wrapping is wrong
  • Q bad quotes
  • F other formatting problem

@github-actions github-actions bot added the orange [process] Done by the Azul team label Oct 23, 2024
@achave11-ucsc achave11-ucsc added the reqs [process] PR includes commit requiring ``make requirements`` label Oct 23, 2024
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/6511-bump-python-pkgs branch 4 times, most recently from 6892a70 to 2dd0f26 Compare October 23, 2024 17:53
@coveralls
Copy link

coveralls commented Oct 23, 2024

Coverage Status

coverage: 85.58% (-0.007%) from 85.587%
when pulling a87b063 on issues/achave11-ucsc/6511-bump-python-pkgs
into 93637ff on develop.

Copy link

codecov bot commented Oct 23, 2024

Codecov Report

Attention: Patch coverage is 94.44444% with 1 line in your changes missing coverage. Please review.

Project coverage is 85.56%. Comparing base (93637ff) to head (a87b063).

Files with missing lines Patch % Lines
test/integration_test.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #6649      +/-   ##
===========================================
- Coverage    85.57%   85.56%   -0.01%     
===========================================
  Files          154      154              
  Lines        20915    20904      -11     
===========================================
- Hits         17897    17886      -11     
  Misses        3018     3018              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/6511-bump-python-pkgs branch 2 times, most recently from 8b6db7f to 686c426 Compare October 28, 2024 18:28
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

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

Even though it is called python-requests in the User-Agent header, it is just the requests package, so I think it should be requests in the commit message:

< [R] Bumped python-requests to 2.32.3 (#6511)
> [R] Bumped requests to 2.32.3 (#6511)

@@ -147,6 +147,15 @@ class RE(str):
'The \'body\' parameter is deprecated for the \'.*\' API '
'and will be removed in .*. Instead use .*'
),
'validate_spec shortcut is deprecated. Use validate instead.',
Copy link
Contributor

Choose a reason for hiding this comment

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

This should have a FIXME comment linking to a new issue.

@dsotirho-ucsc dsotirho-ucsc removed their assignment Oct 28, 2024
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/6511-bump-python-pkgs branch from 5833737 to cdecf66 Compare October 29, 2024 19:34
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/6511-bump-python-pkgs branch from cdecf66 to 48728b4 Compare November 6, 2024 19:17
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

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

To match other commit titles:

< [R] Bumped requests to 2.32.3 (#6511)
> [R] Bump requests to 2.32.3 (#6511)

Comment on lines 153 to 158
'Automatically retrieving remote references can be a security vulnerability and'
' is discouraged by the JSON Schema specifications. Relying on this behavior is'
' deprecated and will shortly become an error. If you are sure you want to '
'remotely retrieve your reference and that it is safe to do so, you can find '
'instructions for doing so via referencing.Registry in the referencing '
'documentation (https://referencing.readthedocs.org).'
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc Nov 7, 2024

Choose a reason for hiding this comment

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

Inconsistent line continuation (some lines start with a space, other lines end with a space). In this situation Hannes prefers lines do not start with a space (so place the space at the end of the previous line).

@dsotirho-ucsc dsotirho-ucsc removed their assignment Nov 7, 2024
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/6511-bump-python-pkgs branch 2 times, most recently from 5d209cd to 61202e0 Compare November 13, 2024 00:03
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

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

The two

[R] Ran make `requirements_update`

commits can be combined so there is only one as the final commit in this PR, and there is a typo in the commit title (the backquote should start before make)

[R] Ran `make requirements_update`

@dsotirho-ucsc dsotirho-ucsc removed their assignment Nov 13, 2024
@achave11-ucsc achave11-ucsc force-pushed the issues/achave11-ucsc/6511-bump-python-pkgs branch 2 times, most recently from af99f7e to ba8b955 Compare November 13, 2024 17:53
dsotirho-ucsc
dsotirho-ucsc previously approved these changes Nov 13, 2024
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

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

Approved.

@dsotirho-ucsc dsotirho-ucsc marked this pull request as ready for review November 13, 2024 21:58
requirements.txt Outdated
Comment on lines 14 to 15
# Updating the following package beyond 3.13.x > breaks test & production code
google-cloud-bigquery==3.13.0
Copy link
Member

Choose a reason for hiding this comment

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

Can't have comment lines like this. Each line needs to be a dependency. If there is a comment, it needs to be at the end of a dependency line. Please create a ticket and

Suggested change
# Updating the following package beyond 3.13.x > breaks test & production code
google-cloud-bigquery==3.13.0
google-cloud-bigquery==3.13.0 # Can't go higher, due to <insert ticket reference here>

The ticket should have a reproduction indicating what breaks if we were to go higher. The title of the commit should refer to #6511 and the new ticket.

Copy link
Member Author

Choose a reason for hiding this comment

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

Understood. But just to clarify, I was following the directive as prescribed (last sentence).

test/azul_test_case.py Outdated Show resolved Hide resolved
requirements.txt Outdated
Comment on lines 14 to 15
# Updating the following package beyond 3.13.x > breaks test & production code
google-cloud-bigquery==3.13.0
Copy link
Member Author

Choose a reason for hiding this comment

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

Understood. But just to clarify, I was following the directive as prescribed (last sentence).

Copy link
Member

@hannes-ucsc hannes-ucsc left a comment

Choose a reason for hiding this comment

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

Could you please add a checklist item to upgrade issues that reminds us to upgrade direct Python dependencies, and a operator manual section that describes the operating procedure for that? It could make use of the PyCharm intention that I mentioned on the issue. The procedure should also state that we only do non-problematic updates, and that we would add a FIXME for those that require more work.

I bumped the estimate by 1 to accommodate this extension of scope.

@hannes-ucsc hannes-ucsc added the 0 reviews [process] Lead didn't request any changes label Nov 22, 2024
@hannes-ucsc hannes-ucsc removed their assignment Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 reviews [process] Lead didn't request any changes orange [process] Done by the Azul team reqs [process] PR includes commit requiring ``make requirements``
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants