diff options
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rw-r--r-- | heat_cfntools/cfntools/cfn_helper.py | 2 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 1745f8e..ca8c4af 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 = 'en' +# language = None # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py index decb5d0..566ecc5 100644 --- a/heat_cfntools/cfntools/cfn_helper.py +++ b/heat_cfntools/cfntools/cfn_helper.py @@ -83,7 +83,7 @@ class HupConfig(object): def __init__(self, fp_list): self.config = ConfigParser.SafeConfigParser() for fp in fp_list: - self.config.readfp(fp) + self.config.read_file(fp) self.load_main_section() @@ -6,7 +6,7 @@ ignore_basepython_conflict = true basepython = python3 setenv = VIRTUAL_ENV={envdir} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -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 {posargs} @@ -34,6 +34,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools [testenv:docs] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_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 |