summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.pre-commit-config.yaml10
-rw-r--r--.zuul.yaml1
-rw-r--r--devstack/lib/osprofiler1
-rw-r--r--requirements.txt2
-rw-r--r--tox.ini2
6 files changed, 12 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 55cf1b5..f044aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ cover
# reno build
releasenotes/build
+RELEASENOTES.rst
+releasenotes/notes/reno.cache
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9d94556..08aef91 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ default_language_version:
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: ebc15addedad713c86ef18ae9632c88e187dd0af # v3.1.0
+ rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
hooks:
- id: trailing-whitespace
# Replaces or checks mixed line ending
@@ -27,9 +27,13 @@ repos:
- id: debug-statements
- id: check-yaml
files: .*\.(yaml|yml)$
- - repo: https://gitlab.com/pycqa/flake8
- rev: 181bb46098dddf7e2d45319ea654b4b4d58c2840 # 3.8.3
+ - repo: local
hooks:
- id: flake8
+ name: flake8
additional_dependencies:
- hacking>=3.0.1,<3.1.0
+ language: python
+ entry: flake8
+ files: '^.*\.py$'
+ exclude: '^(doc|releasenotes|tools)/.*$'
diff --git a/.zuul.yaml b/.zuul.yaml
index a5f2660..62449bf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,6 @@
- check-requirements
- lib-forward-testing-python3
- openstack-cover-jobs
- - openstack-lower-constraints-jobs
- openstack-python3-wallaby-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
diff --git a/devstack/lib/osprofiler b/devstack/lib/osprofiler
index 704b3b6..5176a1e 100644
--- a/devstack/lib/osprofiler
+++ b/devstack/lib/osprofiler
@@ -25,6 +25,7 @@ CONF_FILES=(
$TROVE_TASKMANAGER_CONF
$SENLIN_CONF
$MAGNUM_CONF
+ $MANILA_CONF
$ZUN_CONF
$PLACEMENT_CONF
)
diff --git a/requirements.txt b/requirements.txt
index cb27997..954148d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ netaddr>=0.7.18 # BSD
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.serialization>=2.18.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
-PrettyTable<0.8,>=0.7.2 # BSD
+PrettyTable>=0.7.2 # BSD
requests>=2.14.2 # Apache-2.0
WebOb>=1.7.1 # MIT
importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 0c34eba..1d4ae6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
minversion = 3.1.0
# Needed to create ChangeLog for docs building
skipsdist = False
-envlist = py38,pep8
+envlist = py3,pep8
ignore_basepython_conflict = True
[testenv]