Browse Source

Clean up CI

Bump hacking to resolve dependency problems and drop the lower
constraints job. Includes pep8 fixes.

Change-Id: If5473a753e774767abf60b9fcf9f57a9aa31b580
changes/49/770449/4
Alex Schultz 5 months ago
parent
commit
44cef7984d
7 changed files with 8 additions and 44 deletions
  1. +0
    -33
      lower-constraints.txt
  2. +2
    -0
      os_apply_config/apply_config.py
  3. +3
    -1
      os_apply_config/renderers.py
  4. +2
    -2
      os_apply_config/value_types.py
  5. +1
    -1
      test-requirements.txt
  6. +0
    -6
      tox.ini
  7. +0
    -1
      zuul.d/layout.yaml

+ 0
- 33
lower-constraints.txt View File

@ -1,33 +0,0 @@
alabaster==0.7.10
anyjson==0.3.3
Babel==2.3.4
coverage==4.0
docutils==0.11
extras==1.0.0
fixtures==3.0.0
flake8==2.5.5
hacking==0.12.0
imagesize==0.7.1
Jinja2==2.10
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.2.1
pbr==2.0.0
pep8==1.5.7
pyflakes==0.8.1
Pygments==2.2.0
pystache==0.5.4
python-mimeparse==1.6.0
python-subunit==1.0.0
pytz==2013.6
PyYAML==3.12
requests==2.14.2
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.6.5
sphinxcontrib-websupport==1.0.1
stestr==2.0.0
testscenarios==0.4
testtools==2.2.0
traceback2==1.4.0
unittest2==1.1.0

+ 2
- 0
os_apply_config/apply_config.py View File

@ -375,6 +375,8 @@ DATE_FORMAT = '%Y/%m/%d %I:%M:%S %p'
def add_handler(logger, handler):
handler.setFormatter(logging.Formatter(LOG_FORMAT, datefmt=DATE_FORMAT))
logger.addHandler(handler)
logger = logging.getLogger('os-apply-config')
logger.setLevel(logging.INFO)
add_handler(logger, logging.StreamHandler())


+ 3
- 1
os_apply_config/renderers.py View File

@ -29,8 +29,10 @@ class JsonRenderer(pystache.Renderer):
partials=None,
missing_tags=None):
# json would be html escaped otherwise
def escape_noop(u):
return u
if escape is None:
escape = lambda u: u
escape = escape_noop
return super(JsonRenderer, self).__init__(file_encoding,
string_encoding,
decode_errors, search_dirs,


+ 2
- 2
os_apply_config/value_types.py View File

@ -26,8 +26,8 @@ TYPES = {
"(?#username[:password])([a-zA-Z0-9+_-]+(:[^@]+)?)?"
"(?#@host or file)(@?[a-zA-Z0-9/_.-]+)?"
"(?#/dbname)(/[a-zA-Z0-9_-]+)?"
"(?#?variable=value)(\?[a-zA-Z0-9=_-]+)?$",
"swiftdevices": "^(r\d+z\d+-[A-Za-z0-9.-_]+:%PORT%/[^,]+,?)+$",
"(?#?variable=value)(\\?[a-zA-Z0-9=_-]+)?$",
"swiftdevices": "^(r\\d+z\\d+-[A-Za-z0-9.-_]+:%PORT%/[^,]+,?)+$",
"username": "^[A-Za-z0-9_-]+$",
"raw": ""
}


+ 1
- 1
test-requirements.txt View File

@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=4.0.0,<4.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD


+ 0
- 6
tox.ini View File

@ -35,9 +35,3 @@ commands = {posargs}
[flake8]
exclude = .venv,.tox,dist,doc,*.egg
show-source = true
[testenv:lower-constraints]
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt

+ 0
- 1
zuul.d/layout.yaml View File

@ -2,6 +2,5 @@
templates:
- check-requirements
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- openstack-python3-victoria-jobs
- tripleo-multinode-container-minimal

Loading…
Cancel
Save