sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Drop six usage"

Browse Source
This commit is contained in:
Zuul 2020-06-09 10:28:14 +00:00 committed by Gerrit Code Review
commit caf72a4c56
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diskimage_builder/block_device/plugin.py
View File

@ -12,7 +12,6 @@
import abc import abc
import logging import logging
import six
# #
# Plugins convert configuration entries into graph nodes ready for # Plugins convert configuration entries into graph nodes ready for
@ -22,8 +21,7 @@ import six
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta) class NodeBase(object, metaclass=abc.ABCMeta):
class NodeBase(object):
"""A configuration node entry """A configuration node entry
This is the main driver class for dib-block-device operation. This is the main driver class for dib-block-device operation.
@ -155,8 +153,7 @@ class NodeBase(object):
return return
@six.add_metaclass(abc.ABCMeta) class PluginBase(object, metaclass=abc.ABCMeta):
class PluginBase(object):
"""The base plugin object """The base plugin object
This is the base plugin object. Plugins are an instantiation of This is the base plugin object. Plugins are an instantiation of

1
lower-constraints.txt
View File

@ -36,7 +36,6 @@ PyYAML==3.12
reno==2.5.0 reno==2.5.0
requests==2.14.2 requests==2.14.2
requestsexceptions==1.2.0 requestsexceptions==1.2.0
six==1.10.0
snowballstemmer==1.2.1 snowballstemmer==1.2.1
Sphinx==1.6.2 Sphinx==1.6.2
sphinxcontrib-websupport==1.0.1 sphinxcontrib-websupport==1.0.1

1
requirements.txt
View File

@ -5,7 +5,6 @@
networkx>=1.10 # BSD networkx>=1.10 # BSD
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
PyYAML>=3.12 # MIT PyYAML>=3.12 # MIT
six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0
# NOTE(ianw) in here because dib-lint uses flake8 # NOTE(ianw) in here because dib-lint uses flake8
flake8<4.0.0,>=3.6.0 # MIT flake8<4.0.0,>=3.6.0 # MIT