summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhanshyam Mann <gmann@ghanshyammann.com>2022-04-30 15:13:26 -0500
committerTakashi Kajinami <tkajinam@redhat.com>2022-06-06 13:45:32 +0900
commit8f784480a30570a46f0fbea18ce4368da353aa83 (patch)
tree3aefc87b92c1cfac2eccea96d4820126d12069b3
parentce3f97cecdf4e932cafdffae8f13d07756aed2db (diff)
downloadheat-cfntools-8f784480a30570a46f0fbea18ce4368da353aa83.tar.gz
Drop lower-constraints.txt and its testing
As discussed in TC PTG[1] and TC resolution[2], we are dropping the lower-constraints.txt file and its testing. We will keep lower bounds in the requirements.txt file but with a note that these are not tested lower bounds and we try our best to keep them updated. [1] https://etherpad.opendev.org/p/tc-zed-ptg#L326 [2] https://governance.openstack.org/tc/resolutions/20220414-drop-lower-constraints.html#proposal This also makes the following two changes to fix the broken CI. - Switch the python3 job template to unversioned one because the heat-cfntools project follows an independent release model. This effectively removes py36 tests. - Use upper-constraints.txt to build documentation, to avoid pulling the latest Sphinx which includes a breaking change. Change-Id: I3c41ed7cd54e8c8d3fad05ea7ac86fc35b9fa4d1
-rw-r--r--.zuul.yaml3
-rw-r--r--doc/source/conf.py2
-rw-r--r--lower-constraints.txt6
-rw-r--r--requirements.txt4
-rw-r--r--tox.ini17
5 files changed, 13 insertions, 19 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index e20a91a..e434d15 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,5 @@
- project:
templates:
- check-requirements
- - openstack-lower-constraints-jobs
- - openstack-python3-wallaby-jobs
+ - openstack-python3-jobs
- publish-openstack-docs-pti
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 764df86..1745f8e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -65,7 +65,7 @@ copyright = 'OpenStack Foundation'
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 37b8138..0000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-boto==2.32.1
-pbr==2.0.0
-psutil==1.1.1
-six==1.9.0
-stestr==2.0.0
-testtools==0.9.34
diff --git a/requirements.txt b/requirements.txt
index 58e361b..6e25b63 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,7 @@
+# Requirements lower bounds listed here are our best effort to keep them up to
+# date but we do not test them so no guarantee of having them all correct. If
+# you find any incorrect lower bounds, let us know or propose a fix.
+
pbr!=2.1.0,>=2.0.0
boto>=2.32.1
psutil>=1.1.1
diff --git a/tox.ini b/tox.ini
index fb1208a..8f10fa6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,9 +5,10 @@ ignore_basepython_conflict = true
[testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir}
-deps =-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+deps =
+ -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
@@ -32,11 +33,7 @@ show-source = true
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
[testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -W -b html doc/source doc/build/html
-
-[testenv:lower-constraints]
deps =
- -c{toxinidir}/lower-constraints.txt
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+ -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html