Skip to content

Commit

Permalink
CI: pin tox at the project level
Browse files Browse the repository at this point in the history
No sooner do we fix the gate than tox has a new release that breaks
it again. Let's give them a bit to settle down; in the mean time, stick
with 3.x.

See tox-dev/tox#2811

Also simplify our warning suppressions. The message filter is a regex,
so any prefix of the message will suffice. This allows us to also drop a
new message seen on CentOS 8:

   CryptographyDeprecationWarning: Python 3.6 is no longer
   supported by the Python core team. Therefore, support for
   it is deprecated in cryptography. The next release of
   cryptography (40.0) will be the last to support Python 3.6.

As we've previously seen with cryptography warnings, this can slow down
our probe tests to the point that they time out.

Change-Id: I316170442c67c1b4a5b87f9a1168cc04ca2417b8
  • Loading branch information
tipabu committed Jan 4, 2023
1 parent 2d7c1dc commit f77172e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .zuul.yaml
Expand Up @@ -659,6 +659,8 @@
- swift-tox-func-py38-arm64

- project:
vars:
ensure_tox_version: '<4'
templates:
- publish-openstack-docs-pti
- periodic-stable-jobs
Expand Down
10 changes: 2 additions & 8 deletions swift/__init__.py
Expand Up @@ -79,13 +79,7 @@ def __getattribute__(self, attr):

warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
'Python 2 is no longer supported by the Python core team. '
'Support for it is now deprecated in cryptography, '
'and will be removed in a future release.'))
warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
'Python 2 is no longer supported by the Python core team. '
'Support for it is now deprecated in cryptography, '
'and will be removed in the next release.'))
'Support for it is now deprecated in cryptography'))
warnings.filterwarnings('ignore', message=(
'Python 3.6 is no longer supported by the Python core team. '
'Therefore, support for it is deprecated in cryptography '
'and will be removed in a future release.'))
'Therefore, support for it is deprecated in cryptography'))

0 comments on commit f77172e

Please sign in to comment.