diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-19 18:38:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-19 18:38:25 +0000 |
| commit | 7c99401eef5ff55201adfcf5a4952f6146e3382d (patch) | |
| tree | eeaf0e2efcb1d4d434f71d6ab58cb0bc14963d16 | |
| parent | 2f68b22667e64928cb5eb129d2dced32d27ec967 (diff) | |
| parent | 55a54f736a9406e0f0c1400ba1af6a7167708f5d (diff) | |
| download | pycadf-7c99401eef5ff55201adfcf5a4952f6146e3382d.tar.gz | |
Merge "upgrade hacking to 0.10.0"0.7.0
| -rw-r--r-- | pycadf/cadftype.py | 3 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pycadf/cadftype.py b/pycadf/cadftype.py index 87de7da..40950c1 100644 --- a/pycadf/cadftype.py +++ b/pycadf/cadftype.py @@ -70,7 +70,8 @@ class ValidatorDescriptor(object): raise ValueError('%s must not be None.' % self.name) -class CADFAbstractType(six.with_metaclass(abc.ABCMeta, object)): +@six.add_metaclass(abc.ABCMeta) +class CADFAbstractType(object): """The abstract base class for all CADF (complex) data types (classes).""" @abc.abstractmethod diff --git a/test-requirements.txt b/test-requirements.txt index 3357df5..b512f0f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.9.2,<0.10 +hacking>=0.10.0,<0.11 coverage>=3.6 discover |