Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-castellan for
openSUSE:Factory checked in at 2024-09-04 13:23:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-castellan (Old)
and /work/SRC/openSUSE:Factory/.python-castellan.new.10096 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-castellan"
Wed Sep 4 13:23:29 2024 rev:19 rq:1198494 version:5.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-castellan/python-castellan.changes
2024-06-05 17:42:29.078289978 +0200
+++
/work/SRC/openSUSE:Factory/.python-castellan.new.10096/python-castellan.changes
2024-09-04 13:23:46.079617318 +0200
@@ -1,0 +2,19 @@
+Tue Sep 3 13:05:24 UTC 2024 - [email protected]
+
+- update to version 5.1.1
+ - reno: Update master for unmaintained/xena
+ - Remove unused test hook scripts
+ - reno: Update master for unmaintained/victoria
+ - vault: Hide values used for authentication
+ - reno: Update master for unmaintained/wallaby
+ - Use upper-constraint in doc generation
+ - pre-commit: Bump versions
+ - reno: Update master for unmaintained/zed
+ - Fix vault key managed fixed broken by a typo
+ - vault: Add timeout option
+ - Remove old excludes
+ - Update master for stable/2024.1
+ - pre-commit: Integrate bandit
+ - Drop wrong documented choices for barbican_endpoint_type
+
+-------------------------------------------------------------------
Old:
----
castellan-5.0.0.tar.gz
New:
----
castellan-5.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-castellan.spec ++++++
--- /var/tmp/diff_new_pack.GLMuW4/_old 2024-09-04 13:23:46.631640417 +0200
+++ /var/tmp/diff_new_pack.GLMuW4/_new 2024-09-04 13:23:46.631640417 +0200
@@ -17,13 +17,13 @@
Name: python-castellan
-Version: 5.0.0
+Version: 5.1.1
Release: 0
Summary: Generic Key Manager interface for OpenStack
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/castellan
-Source0:
https://files.pythonhosted.org/packages/source/c/castellan/castellan-5.0.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/c/castellan/castellan-5.1.1.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-barbicanclient >= 5.5.0
BuildRequires: python3-cryptography >= 2.7
@@ -74,7 +74,7 @@
This package contains the documentation
%prep
-%autosetup -p1 -n castellan-5.0.0
+%autosetup -p1 -n castellan-5.1.1
%py_req_cleanup
%build
++++++ castellan-5.0.0.tar.gz -> castellan-5.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/.pre-commit-config.yaml
new/castellan-5.1.1/.pre-commit-config.yaml
--- old/castellan-5.0.0/.pre-commit-config.yaml 2024-03-05 10:56:45.000000000
+0100
+++ new/castellan-5.1.1/.pre-commit-config.yaml 2024-08-15 11:52:50.000000000
+0200
@@ -1,15 +1,6 @@
-# We from the Oslo project decided to pin repos based on the
-# commit hash instead of the version tag to prevend arbitrary
-# code from running in developer's machines. To update to a
-# newer version, run `pre-commit autoupdate` and then replace
-# the newer versions with their commit hash.
-
-default_language_version:
- python: python3
-
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+ rev: v4.5.0
hooks:
- id: trailing-whitespace
# Replaces or checks mixed line ending
@@ -27,13 +18,17 @@
- id: debug-statements
- id: check-yaml
files: .*\.(yaml|yml)$
- - repo: local
+ - repo: https://opendev.org/openstack/hacking
+ rev: 6.1.0
hooks:
- - id: flake8
- name: flake8
- additional_dependencies:
- - hacking>=6.1.0,<6.2.0
- language: python
- entry: flake8
- files: '^.*\.py$'
- exclude: '^(doc|releasenotes|tools)/.*$'
+ - id: hacking
+ additional_dependencies: []
+ - repo: https://github.com/PyCQA/bandit
+ rev: 1.7.6
+ hooks:
+ - id: bandit
+ # B105-B107: hardcoded password checks - likely to generate false
+ # positives in a gate environment
+ # B607: start process with a partial path - this should be a project
+ # level decision
+ args: ['-x', 'tests', '-s', 'B105,B106,B107,B607']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/AUTHORS new/castellan-5.1.1/AUTHORS
--- old/castellan-5.0.0/AUTHORS 2024-03-05 10:57:16.000000000 +0100
+++ new/castellan-5.1.1/AUTHORS 2024-08-15 11:53:17.000000000 +0200
@@ -14,6 +14,7 @@
Daniel Bengtsson <[email protected]>
Davanum Srinivas <[email protected]>
Dave McCowan <[email protected]>
+Dmitry Novikov <[email protected]>
Doug Hellmann <[email protected]>
Douglas Mendizábal <[email protected]>
Douglas Mendizábal <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/ChangeLog
new/castellan-5.1.1/ChangeLog
--- old/castellan-5.0.0/ChangeLog 2024-03-05 10:57:16.000000000 +0100
+++ new/castellan-5.1.1/ChangeLog 2024-08-15 11:53:16.000000000 +0200
@@ -1,6 +1,26 @@
CHANGES
=======
+5.1.1
+-----
+
+* Fix vault key managed fixed broken by a typo
+
+5.1.0
+-----
+
+* Remove unused test hook scripts
+* reno: Update master for unmaintained/zed
+* Remove old excludes
+* Drop wrong documented choices for barbican\_endpoint\_type
+* vault: Hide values used for authentication
+* Use upper-constraint in doc generation
+* vault: Add timeout option
+* Update master for stable/2024.1
+* reno: Update master for unmaintained/xena
+* reno: Update master for unmaintained/wallaby
+* reno: Update master for unmaintained/victoria
+
5.0.0
-----
@@ -12,6 +32,8 @@
* Raise ManagedObjectNotFoundError in MockKeyManager
* reno: Update master for unmaintained/yoga
* tox: Drop envdir
+* pre-commit: Integrate bandit
+* pre-commit: Bump versions
* Bump hacking
* Update python classifier in setup.cfg
* Update master for stable/2023.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/PKG-INFO new/castellan-5.1.1/PKG-INFO
--- old/castellan-5.0.0/PKG-INFO 2024-03-05 10:57:16.653267600 +0100
+++ new/castellan-5.1.1/PKG-INFO 2024-08-15 11:53:17.221266500 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: castellan
-Version: 5.0.0
+Version: 5.1.1
Summary: Generic Key Manager interface for OpenStack
Home-page: https://docs.openstack.org/castellan/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/castellan-5.0.0/castellan/key_manager/barbican_key_manager.py
new/castellan-5.1.1/castellan/key_manager/barbican_key_manager.py
--- old/castellan-5.0.0/castellan/key_manager/barbican_key_manager.py
2024-03-05 10:56:45.000000000 +0100
+++ new/castellan-5.1.1/castellan/key_manager/barbican_key_manager.py
2024-08-15 11:52:50.000000000 +0200
@@ -75,8 +75,7 @@
cfg.StrOpt('barbican_endpoint_type',
default='public',
choices=['public', 'internal', 'admin'],
- help='Specifies the type of endpoint. Allowed values are: '
- 'public, private, and admin'),
+ help='Specifies the type of endpoint.'),
cfg.StrOpt('barbican_region_name',
default=None,
help='Specifies the region of the chosen endpoint.'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/castellan-5.0.0/castellan/key_manager/vault_key_manager.py
new/castellan-5.1.1/castellan/key_manager/vault_key_manager.py
--- old/castellan-5.0.0/castellan/key_manager/vault_key_manager.py
2024-03-05 10:56:45.000000000 +0100
+++ new/castellan-5.1.1/castellan/key_manager/vault_key_manager.py
2024-08-15 11:52:50.000000000 +0200
@@ -26,7 +26,6 @@
import time
import uuid
-from keystoneauth1 import loading
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils
@@ -45,10 +44,13 @@
_vault_opts = [
cfg.StrOpt('root_token_id',
+ secret=True,
help='root token for vault'),
cfg.StrOpt('approle_role_id',
+ secret=True,
help='AppRole role_id for authentication with vault'),
cfg.StrOpt('approle_secret_id',
+ secret=True,
help='AppRole secret_id for authentication with vault'),
cfg.StrOpt('kv_mountpoint',
default=_DEFAULT_MOUNTPOINT,
@@ -74,6 +76,9 @@
help=_("Vault Namespace to use for all requests to Vault. "
"Vault Namespaces feature is available only in "
"Vault Enterprise")),
+ cfg.FloatOpt('timeout',
+ default=60,
+ help=_('Timeout (in seconds) in each request to Vault')),
]
_VAULT_OPT_GROUP = 'vault'
@@ -95,7 +100,6 @@
def __init__(self, configuration):
self._conf = configuration
self._conf.register_opts(_vault_opts, group=_VAULT_OPT_GROUP)
- loading.register_session_conf_options(self._conf, _VAULT_OPT_GROUP)
self._session = requests.Session()
self._root_token_id = self._conf.vault.root_token_id
self._approle_role_id = self._conf.vault.approle_role_id
@@ -108,6 +112,7 @@
self._kv_version = self._conf.vault.kv_version
self._vault_url = self._conf.vault.vault_url
self._namespace = self._conf.vault.namespace
+ self._timeout = self._conf.vault.timeout
if self._vault_url.startswith("https://";):
self._verify_server = self._conf.vault.ssl_ca_crt_file or True
else:
@@ -166,7 +171,8 @@
resp = self._session.post(url=approle_login_url,
json=params,
headers=headers,
- verify=self._verify_server)
+ verify=self._verify_server,
+ timeout=self._timeout)
except requests.exceptions.Timeout as ex:
raise exception.KeyManagerError(str(ex))
except requests.exceptions.ConnectionError as ex:
@@ -193,11 +199,11 @@
return {}
def _do_http_request(self, method, resource, json=None):
- verify = self._verify_server
headers = self._build_auth_headers()
try:
- resp = method(resource, headers=headers, json=json, verify=verify)
+ resp = method(resource, headers=headers, json=json,
+ verify=self._verify_server, timeout=self._timeout)
except requests.exceptions.Timeout as ex:
raise exception.KeyManagerError(str(ex))
except requests.exceptions.ConnectionError as ex:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/castellan/tests/contrib/gate_hook.sh
new/castellan-5.1.1/castellan/tests/contrib/gate_hook.sh
--- old/castellan-5.0.0/castellan/tests/contrib/gate_hook.sh 2024-03-05
10:56:45.000000000 +0100
+++ new/castellan-5.1.1/castellan/tests/contrib/gate_hook.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-$BASE/new/devstack-gate/devstack-vm-gate.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/castellan-5.0.0/castellan/tests/contrib/post_test_hook.sh
new/castellan-5.1.1/castellan/tests/contrib/post_test_hook.sh
--- old/castellan-5.0.0/castellan/tests/contrib/post_test_hook.sh
2024-03-05 10:56:45.000000000 +0100
+++ new/castellan-5.1.1/castellan/tests/contrib/post_test_hook.sh
1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -xe
-
-CASTELLAN_DIR="$BASE/new/castellan"
-
-
-function generate_testr_results {
- if [ -f .testrepository/0 ]; then
- sudo .tox/functional/bin/testr last --subunit >
$WORKSPACE/testrepository.subunit
- sudo mv $WORKSPACE/testrepository.subunit
$BASE/logs/testrepository.subunit
- sudo /usr/os-testr-env/bin/subunit2html
$BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
- sudo gzip -9 $BASE/logs/testrepository.subunit
- sudo gzip -9 $BASE/logs/testr_results.html
- sudo chown $USER:$USER $BASE/logs/testrepository.subunit.gz
$BASE/logs/testr_results.html.gz
- sudo chmod a+r $BASE/logs/testrepository.subunit.gz
$BASE/logs/testr_results.html.gz
- fi
-}
-
-owner=tempest
-
-# Set owner permissions according to job's requirements.
-cd $CASTELLAN_DIR
-sudo chown -R $owner:stack $CASTELLAN_DIR
-
-testenv=functional
-
-# Run tests
-echo "Running Castellan $testenv test suite"
-set +e
-
-sudo -H -u $owner tox -e $testenv
-
-testr_exit_code=$?
-set -e
-
-# Collect and parse results
-generate_testr_results
-exit $testr_exit_code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/castellan.egg-info/PKG-INFO
new/castellan-5.1.1/castellan.egg-info/PKG-INFO
--- old/castellan-5.0.0/castellan.egg-info/PKG-INFO 2024-03-05
10:57:16.000000000 +0100
+++ new/castellan-5.1.1/castellan.egg-info/PKG-INFO 2024-08-15
11:53:17.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: castellan
-Version: 5.0.0
+Version: 5.1.1
Summary: Generic Key Manager interface for OpenStack
Home-page: https://docs.openstack.org/castellan/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/castellan.egg-info/SOURCES.txt
new/castellan-5.1.1/castellan.egg-info/SOURCES.txt
--- old/castellan-5.0.0/castellan.egg-info/SOURCES.txt 2024-03-05
10:57:16.000000000 +0100
+++ new/castellan-5.1.1/castellan.egg-info/SOURCES.txt 2024-08-15
11:53:17.000000000 +0200
@@ -55,8 +55,6 @@
castellan/tests/__init__.py
castellan/tests/base.py
castellan/tests/utils.py
-castellan/tests/contrib/gate_hook.sh
-castellan/tests/contrib/post_test_hook.sh
castellan/tests/functional/__init__.py
castellan/tests/functional/config.py
castellan/tests/functional/key_manager/__init__.py
@@ -119,8 +117,10 @@
releasenotes/notes/vault-approle-support-5ea04daea07a152f.yaml
releasenotes/notes/vault-kv-mountpoint-919eb547764a0c74.yaml
releasenotes/notes/vault-namespaces-7d334e7407396df9.yaml
+releasenotes/notes/vault-timeout-5eebb432e0943f74.yaml
releasenotes/source/2023.1.rst
releasenotes/source/2023.2.rst
+releasenotes/source/2024.1.rst
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/pike.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/castellan.egg-info/pbr.json
new/castellan-5.1.1/castellan.egg-info/pbr.json
--- old/castellan-5.0.0/castellan.egg-info/pbr.json 2024-03-05
10:57:16.000000000 +0100
+++ new/castellan-5.1.1/castellan.egg-info/pbr.json 2024-08-15
11:53:17.000000000 +0200
@@ -1 +1 @@
-{"git_version": "d578cbc", "is_release": true}
\ No newline at end of file
+{"git_version": "72fd3c1", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/castellan.egg-info/requires.txt
new/castellan-5.1.1/castellan.egg-info/requires.txt
--- old/castellan-5.0.0/castellan.egg-info/requires.txt 2024-03-05
10:57:16.000000000 +0100
+++ new/castellan-5.1.1/castellan.egg-info/requires.txt 2024-08-15
11:53:17.000000000 +0200
@@ -5,7 +5,7 @@
oslo.i18n>=3.15.3
oslo.log>=3.36.0
oslo.utils>=3.33.0
-pbr!=2.1.0,>=2.0.0
+pbr>=2.0.0
python-barbicanclient>=5.5.0
-requests!=2.20.0,>=2.18.0
+requests>=2.18.0
stevedore>=1.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/doc/requirements.txt
new/castellan-5.1.1/doc/requirements.txt
--- old/castellan-5.0.0/doc/requirements.txt 2024-03-05 10:56:45.000000000
+0100
+++ new/castellan-5.1.1/doc/requirements.txt 2024-08-15 11:52:50.000000000
+0200
@@ -1,4 +1,4 @@
-sphinx>=2.0.0,!=2.1.0 # BSD
+sphinx>=2.0.0 # BSD
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
reno>=3.1.0 # Apache-2.0
openstackdocstheme>=2.2.1 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/castellan-5.0.0/releasenotes/notes/vault-timeout-5eebb432e0943f74.yaml
new/castellan-5.1.1/releasenotes/notes/vault-timeout-5eebb432e0943f74.yaml
--- old/castellan-5.0.0/releasenotes/notes/vault-timeout-5eebb432e0943f74.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/notes/vault-timeout-5eebb432e0943f74.yaml
2024-08-15 11:52:50.000000000 +0200
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ The new ``[vault] timeout`` option has been added. This determines timeout
+ in each HTTP request to Vault server. It defaults to 60 seconds.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/releasenotes/source/2024.1.rst
new/castellan-5.1.1/releasenotes/source/2024.1.rst
--- old/castellan-5.0.0/releasenotes/source/2024.1.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/source/2024.1.rst 2024-08-15
11:52:50.000000000 +0200
@@ -0,0 +1,6 @@
+===========================
+2024.1 Series Release Notes
+===========================
+
+.. release-notes::
+ :branch: stable/2024.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/releasenotes/source/index.rst
new/castellan-5.1.1/releasenotes/source/index.rst
--- old/castellan-5.0.0/releasenotes/source/index.rst 2024-03-05
10:56:45.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/source/index.rst 2024-08-15
11:52:50.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ 2024.1
2023.2
2023.1
zed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/releasenotes/source/victoria.rst
new/castellan-5.1.1/releasenotes/source/victoria.rst
--- old/castellan-5.0.0/releasenotes/source/victoria.rst 2024-03-05
10:56:45.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/source/victoria.rst 2024-08-15
11:52:50.000000000 +0200
@@ -3,4 +3,4 @@
=============================
.. release-notes::
- :branch: stable/victoria
+ :branch: unmaintained/victoria
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/releasenotes/source/wallaby.rst
new/castellan-5.1.1/releasenotes/source/wallaby.rst
--- old/castellan-5.0.0/releasenotes/source/wallaby.rst 2024-03-05
10:56:45.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/source/wallaby.rst 2024-08-15
11:52:50.000000000 +0200
@@ -3,4 +3,4 @@
============================
.. release-notes::
- :branch: stable/wallaby
+ :branch: unmaintained/wallaby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/releasenotes/source/xena.rst
new/castellan-5.1.1/releasenotes/source/xena.rst
--- old/castellan-5.0.0/releasenotes/source/xena.rst 2024-03-05
10:56:45.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/source/xena.rst 2024-08-15
11:52:50.000000000 +0200
@@ -3,4 +3,4 @@
=========================
.. release-notes::
- :branch: stable/xena
+ :branch: unmaintained/xena
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/releasenotes/source/zed.rst
new/castellan-5.1.1/releasenotes/source/zed.rst
--- old/castellan-5.0.0/releasenotes/source/zed.rst 2024-03-05
10:56:45.000000000 +0100
+++ new/castellan-5.1.1/releasenotes/source/zed.rst 2024-08-15
11:52:50.000000000 +0200
@@ -3,4 +3,4 @@
========================
.. release-notes::
- :branch: stable/zed
+ :branch: unmaintained/zed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/requirements.txt
new/castellan-5.1.1/requirements.txt
--- old/castellan-5.0.0/requirements.txt 2024-03-05 10:56:45.000000000
+0100
+++ new/castellan-5.1.1/requirements.txt 2024-08-15 11:52:50.000000000
+0200
@@ -1,4 +1,4 @@
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
+pbr>=2.0.0 # Apache-2.0
cryptography>=2.7 # BSD/Apache-2.0
python-barbicanclient>=5.5.0 # Apache-2.0
oslo.config>=6.4.0 # Apache-2.0
@@ -8,4 +8,4 @@
oslo.utils>=3.33.0 # Apache-2.0
stevedore>=1.20.0 # Apache-2.0
keystoneauth1>=3.4.0 # Apache-2.0
-requests>=2.18.0,!=2.20.0 # Apache-2.0
+requests>=2.18.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/test-requirements.txt
new/castellan-5.1.1/test-requirements.txt
--- old/castellan-5.0.0/test-requirements.txt 2024-03-05 10:56:45.000000000
+0100
+++ new/castellan-5.1.1/test-requirements.txt 2024-08-15 11:52:50.000000000
+0200
@@ -1,6 +1,4 @@
-hacking>=6.1.0,<6.2.0 # Apache-2.0
-
-coverage!=4.4,>=4.0 # Apache-2.0
+coverage>=4.0 # Apache-2.0
python-barbicanclient>=4.5.2 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
@@ -9,7 +7,4 @@
fixtures>=3.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
-bandit>=1.6.0,<1.7.0 # Apache-2.0
pifpaf>=0.10.0 # Apache-2.0
-
-pre-commit>=2.6.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/castellan-5.0.0/tox.ini new/castellan-5.1.1/tox.ini
--- old/castellan-5.0.0/tox.ini 2024-03-05 10:56:45.000000000 +0100
+++ new/castellan-5.1.1/tox.ini 2024-08-15 11:52:50.000000000 +0200
@@ -7,30 +7,19 @@
usedevelop = True
basepython = python3
setenv =
- VIRTUAL_ENV={envdir}
- OS_TEST_PATH=./castellan/tests/unit
+ VIRTUAL_ENV={envdir}
+ OS_TEST_PATH=./castellan/tests/unit
deps =
-
-c{env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest --concurrency=1 {posargs}
[testenv:pep8]
+deps =
+ pre-commit
commands =
pre-commit run -a
- bandit -r castellan -x tests -s B105,B106,B107,B607
-
-[testenv:bandit]
-# This command runs the bandit security linter against the castellan
-# codebase minus the tests directory. Some tests are being excluded to
-# reduce the number of positives before a team inspection, and to ensure a
-# passing gate job for initial addition. The excluded tests are:
-# B105-B107: hardcoded password checks - likely to generate false positives
-# in a gate environment
-# B607: start process with a partial path - this should be a project level
-# decision
-commands =
- bandit -r castellan -x tests -s B105,B106,B107,B607
[testenv:venv]
commands = {posargs}
@@ -53,10 +42,12 @@
# This environment is called from CI scripts to test and publish
# the main docs to https://docs.openstack.org/castellan
description = Build main documentation
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
commands=
- rm -rf doc/build doc/build/doctrees
- sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
+ rm -rf doc/build doc/build/doctrees
+ sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
allowlist_externals = rm
[testenv:pdf-docs]
