Merge branch 'dev' into master

Author: cs-cruz

.gitlab-ci.yml

@@ -27,7 +27,7 @@ test:
   script:
     - pip install tox
     - tox -e py27
-    - tox -e py38 -- --with-coverage --cover-erase --cover-package=cgroupspy
+    - tox -e py38 -- --with-coverage
 
 trigger_build:
   stage: deploy

cgroupspy/__init__.py

@@ -24,4 +24,4 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-__version__ = "0.2.1"
+__version__ = "0.2.2"

cgroupspy/interfaces.py

@@ -24,7 +24,10 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-from collections import Iterable
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 from cgroupspy.contenttypes import BaseContentType
 
 

setup.py

@@ -13,7 +13,7 @@
     name='cgroupspy',
     version=cgroupspy.__version__,
     packages=['cgroupspy'],
-    tests_require=['mock', 'nose>=1.3'],
+    tests_require=['mock', 'nose2'],
     author='CloudSigma AG',
     author_email='dev-support@cloudsigma.com',
     maintainer='Miguel Trujillo',
@@ -23,7 +23,13 @@
         'cgroups',
     ],
     classifiers=[
-        "Programming Language :: Python",
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         "Development Status :: 4 - Beta",
         "Intended Audience :: System Administrators",
         "Intended Audience :: Developers",
@@ -33,4 +39,5 @@
     description="Python library for managing cgroups",
     long_description=long_description,
     long_description_content_type='text/markdown',
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
 )

tox.ini

@@ -1,9 +1,9 @@
 [tox]
-envlist = py27,py38
+envlist = py27,py38,py39,py310
 
 [testenv]
 deps =
     coverage
     mock
-    nose
-commands = nosetests {posargs}
+    nose2
+commands = nose2 {posargs}