Skip to content

Conversation

@cognifloyd
Copy link
Member

@cognifloyd cognifloyd commented Apr 27, 2024

This extracts the oslo.config commits by @nzlosh from #6157.

  • Bump oslo.config version for py3.10 support
  • Fix ssl_cert_reqs choices and update data type of newer version of oslo.config
  • Adjust expected msg in test for oslo.config update
  • Black formatting
  • Relax pants requirements for oslo.config
  • Adjust comment in fixed-requirements.txt
  • bump fixed-requirements.txt to match lockfiles/st2.lock

Lockfile diff:

                                                                  
Lockfile diff: lockfiles/st2.lock [st2]
                                                                  
==                    Upgraded dependencies                     ==

  filelock                       3.13.4       -->   3.14.0
  oslo-config                    1.12.1       -->   9.4.0
  pytest                         8.1.1        -->   8.2.0
  virtualenv                     20.26.0      -->   20.26.1
                                                                  
==                      Added dependencies                      ==

  rfc3986                        2.0.0

@cognifloyd cognifloyd added this to the 3.9.0 milestone Apr 27, 2024
@cognifloyd cognifloyd requested review from a team, amanda11, mamercad, nzlosh and winem April 27, 2024 15:38
@pull-request-size pull-request-size bot added the size/L PR that changes 100-499 lines. Requires some effort to review. label Apr 27, 2024

apscheduler
argcomplete
argparse
Copy link
Member Author

Choose a reason for hiding this comment

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

This was only included as a transitive dep of the old version of oslo.config, and the newer versions don't require it, so pants happily removed it from the lockfile. However, our code directly imports it, so I added it back as a direct dep.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the hint. Was already wondering how it could work without argparse.


expected_msg = "Valid values are: strict, lax, none, unset"
self.assertRaisesRegex(
ValueError, expected_msg, validate_auth_cookie_is_correctly_configured
Copy link
Member Author

Choose a reason for hiding this comment

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

The newer version of oslo.config errors out itself, so some of our custom validation in the validate_auth_cookie_is_correctly_configured function is no longer needed.

@cognifloyd cognifloyd requested a review from a team April 30, 2024 20:17
@cognifloyd
Copy link
Member Author

rebased on master

@cognifloyd cognifloyd enabled auto-merge April 30, 2024 20:51

apscheduler
argcomplete
argparse
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the hint. Was already wondering how it could work without argparse.

@cognifloyd cognifloyd merged commit 180deff into master May 8, 2024
@cognifloyd cognifloyd deleted the update-oslo.config branch May 8, 2024 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

external dependency python3 size/L PR that changes 100-499 lines. Requires some effort to review.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants