Merge branch 'newer_builds' into 'master'

Release 1.2.2

See merge request tcl/pytiger!2

Author: bootc

.gitlab-ci.yml

@@ -5,14 +5,12 @@ stages:
 
 .build_template: &build_template
   stage: build
-  variables:
-    COVERAGE_PKG: "coverage"
   script:
     - pip install -r requirements.txt
-    - pip install $COVERAGE_PKG flake8 nose mock
+    - pip install coverage flake8 mock pytest pytest-cov
     # - python3 setup.py check -mrs
-    # - python3 setup.py flake8
-    - python setup.py nosetests
+    - flake8 src/pytiger
+    - pytest --cov pytiger src/pytiger
 
 build-py2.7:
   <<: *build_template
@@ -42,21 +40,32 @@ build-py3.9:
   <<: *build_template
   image: python:3.9
 
+build-py3.10:
+  <<: *build_template
+  image: python:3.10
+
+build-py3.11:
+  <<: *build_template
+  image: python:3.11
+
+build-py3.12:
+  <<: *build_template
+  image: python:3.12
+
 pages:
   stage: build
-  image: python:3.7
+  image: python:3.12
   script:
     - pip install -r requirements.txt
     - pip install sphinx
-    - python setup.py build_sphinx
-    - mv build/sphinx/html public
+    - sphinx-build docs public
   artifacts:
     paths:
       - public
 
 rpm-source:
   stage: build
-  image: centos:7
+  image: rockylinux:9
   before_script:
     - yum -y install
         git
@@ -97,6 +106,8 @@ rpm-source:
     - yum -y install
         epel-release
         ${rpm_scl:+centos-release-scl}
+    # https://wiki.rockylinux.org/rocky/repo/#notes-on-crb
+    - /usr/bin/crb enable || true
     - yum -y install
         epel-rpm-macros
         rpm-build
@@ -120,12 +131,6 @@ epel-7-x86_64:
   extends: .rpm-binary-template
   image: centos:7
 
-epel-7-sclpy35-x86_64:
-  extends: .rpm-binary-template
-  image: centos:7
-  variables:
-    rpm_scl: rh-python35
-
 epel-7-sclpy36-x86_64:
   extends: .rpm-binary-template
   image: centos:7

docs/changes.rst

@@ -2,6 +2,13 @@
 Changes in pytiger
 ******************
 
+Release 1.2.2
+=============
+
+ * Add GitLab CI test runs and RPM building.
+ * Overhaul the RPM spec file completely.
+ * Refactor :mod:`pytiger.utils.plugins` for Python 3.12.
+
 Release 1.2.1
 =============
 

docs/conf.py

@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.1'
+release = '1.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pytiger.spec

@@ -1,25 +1,24 @@
-%{?scl:%scl_package pytiger}
-%{!?scl:%global pkg_name %{name}}
+%if 0%{?scl:1}
+%scl_package pytiger
+%global py_prefix %{scl_prefix}python
+%else
+%global pkg_name pytiger
+%global py_prefix python%{python3_pkgversion}
+%endif
 
 %if 0%{?rhel} == 7 && 0%{!?scl:1}
 # This flag denotes we want to build python2 and python3 RPMs in one go, which
-# only applies on CentOS 7 for Python 2.7 and 3.4/3.6, and only if we are NOT
+# only applies on CentOS 7 for Python 2.7 and 3.6, and only if we are NOT
 # building for an SCL Python package.
-%global _want_dual_pythons 1
-%endif
-
-# The current convention for Python 2.x non-SCL packages is to prefix them
-# python2-, so conditionally define a macro we can use to add this tag.
-%if 0%{!?scl:1}
-%global python2_pkgtag 2
+%global _want_python2 1
 %endif
 
 %global sum Tiger Computing Ltd Python Utilities
 
-Name: %{?scl_prefix}pytiger
+Name: %{?scl_prefix}%{pkg_name}
 Summary: %{sum}
-Version: 1.2.1
-Release: 4%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
 
 Group: Development/Libraries
 License: BSD-3-clause
@@ -28,73 +27,66 @@ Url: https://github.com/tigercomputing/%{pkg_name}
 
 BuildArch: noarch
 BuildRequires: epel-rpm-macros
-
-BuildRequires: python%{python3_pkgversion}-devel
-BuildRequires: python%{python3_pkgversion}-setuptools
+%{?scl:BuildRequires: %{scl_prefix}build}
+BuildRequires: %{py_prefix}-devel
+BuildRequires: %{py_prefix}-setuptools
 
 # Requirements for RHEL7 py2 only
-%if 0%{?_want_dual_pythons:1}
-BuildRequires: %{?scl_prefix}python-devel
-BuildRequires: %{?scl_prefix}python-setuptools
+%if 0%{?_want_python2:1}
+BuildRequires: python-devel
+BuildRequires: python-setuptools
 %endif
 
 %description
 This is the Tiger Computing Ltd Python Utility library, pytiger.
 
-%package -n python%{python3_pkgversion}-%{pkg_name}
+%package -n %{py_prefix}-%{pkg_name}
 Summary: %{sum}
-Requires: python%{python3_pkgversion}-six
+Requires: %{py_prefix}-six
 
-%description -n python%{python3_pkgversion}-%{pkg_name}
+%description -n %{py_prefix}-%{pkg_name}
 This is the Tiger Computing Ltd Python Utility library, pytiger.
 
 # For dual pythons, add in the extra binary package
-%if 0%{?_want_dual_pythons:1}
-%package -n %{?scl_prefix}python%{?python2_pkgtag}-%{pkg_name}
+%if 0%{?_want_python2:1}
+%package -n python2-%{pkg_name}
 Summary: %{sum}
-Requires: %{?scl_prefix}python-six
-%if 0%{!?scl:1}
-%{?python_provide:%python_provide python%{?python2_pkgtag}-%{pkg_name}}
-%endif
+Requires: python-six
 
-%description -n %{?scl_prefix}python%{?python2_pkgtag}-%{pkg_name}
+%description -n python2-%{pkg_name}
 This is the Tiger Computing Ltd Python Utility library, pytiger.
 %endif
 
 %prep
 %setup -n %{pkg_name}-%{version} -q
 
 %build
-%if 0%{?scl:1}
-%{?scl:scl enable %{scl} "}
-%{__python} setup.py build
-%{?scl:"}
-%else
-%py3_build
-%{?_want_dual_pythons:%py_build}
-%endif
+%{?scl:scl enable %{scl} - << \EOF}
+%{__python3} setup.py build
+%{?scl:EOF}
+%{?_want_python2:%{__python} setup.py build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if 0%{?scl:1}
-%{?scl:scl enable %{scl} "}
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT \
-  --install-data=%{_datadir}
-%{?scl:"}
-%else
-%py3_install
-%{?_want_dual_pythons:%py_install}
-%endif
+%{?scl:scl enable %{scl} - << \EOF}
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{?scl:EOF}
+%{?_want_python2:%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT}
 
-%files -n python%{python3_pkgversion}-%{pkg_name}
+%files -n %{py_prefix}-%{pkg_name}
 %{python3_sitelib}/*
 
-%if 0%{?_want_dual_pythons:1}
-%files -n %{?scl_prefix}python%{?python2_pkgtag}-%{pkg_name}
+%if 0%{?_want_python2:1}
+%files -n python2-%{pkg_name}
 %{python_sitelib}/*
 %endif
 
 %changelog
+* Tue Oct 24 2023 Chris Boot <[email protected]> - 1.2.2-1
+- Add GitLab CI test runs and RPM building.
+- Overhaul the RPM spec file completely.
+- Refactor pytiger.utils.plugins for Python 3.12.
+
 * Wed Jan 13 2021 Jonathan Wiltshire <[email protected]> - 1.2.1-4
 - Build for Python 3 by default, and Python 2 as an option.
 

setup.py

@@ -9,7 +9,7 @@
 from setuptools import setup, find_packages
 
 setup(name='pytiger',
-      version='1.2.1',
+      version='1.2.2',
       description='Tiger Computing Ltd Python Utilities',
       author='Tiger Computing Ltd',
       author_email='[email protected]',

src/pytiger/monitoring/test_monitoringcheck.py

@@ -54,7 +54,7 @@ def test_exit_messages(self, mock_exit):
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit()
         output = out.getvalue().strip()
-        self.assertEquals(output, 'line 1, line 2')
+        self.assertEqual(output, 'line 1, line 2')
 
     @patch('sys.exit')
     def test_exit_messages_custom_separator(self, mock_exit):
@@ -63,18 +63,18 @@ def test_exit_messages_custom_separator(self, mock_exit):
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit(separator=";")
         output = out.getvalue().strip()
-        self.assertEquals(output, 'line 1;line 2')
+        self.assertEqual(output, 'line 1;line 2')
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit(separator="\n")
         output = out.getvalue().strip()
-        self.assertEquals(output, 'line 1\nline 2')
+        self.assertEqual(output, 'line 1\nline 2')
 
     @patch('sys.exit')
     def test_exit_unset_nomessages(self, mock_exit):
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit()
         output = out.getvalue().strip()
-        self.assertEquals(output, 'UNKNOWN: No state asserted')
+        self.assertEqual(output, 'UNKNOWN: No state asserted')
         mock_exit.assert_called_once_with(3)
 
     ####################

src/pytiger/nagios/test_nagioscheck.py

@@ -63,7 +63,7 @@ def test_exit_messages(self, mock_exit):
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit()
         output = out.getvalue().strip()
-        self.assertEquals(output, 'line 1, line 2')
+        self.assertEqual(output, 'line 1, line 2')
 
     @patch('sys.exit')
     def test_exit_messages_custom_separator(self, mock_exit):
@@ -72,18 +72,18 @@ def test_exit_messages_custom_separator(self, mock_exit):
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit(separator=";")
         output = out.getvalue().strip()
-        self.assertEquals(output, 'line 1;line 2')
+        self.assertEqual(output, 'line 1;line 2')
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit(separator="\n")
         output = out.getvalue().strip()
-        self.assertEquals(output, 'line 1\nline 2')
+        self.assertEqual(output, 'line 1\nline 2')
 
     @patch('sys.exit')
     def test_exit_unset_nomessages(self, mock_exit):
         with patch('sys.stdout', new=StringIO()) as out:
             self.n.exit()
         output = out.getvalue().strip()
-        self.assertEquals(output, 'UNKNOWN: No state asserted')
+        self.assertEqual(output, 'UNKNOWN: No state asserted')
         mock_exit.assert_called_once_with(3)
 
     ####################

src/pytiger/utils/plugins.py

@@ -3,18 +3,23 @@
 A simple plugin loading mechanism
 """
 
-# Copyright © 2015 Tiger Computing Ltd
+# Copyright © 2015-2023 Tiger Computing Ltd
 # This file is part of pytiger and distributed under the terms
 # of a BSD-like license
 # See the file COPYING for details
 
-# Idea borrowed and adapted from:
+# Idea originally borrowed and adapted from:
 # https://copyninja.info/blog/dynamic-module-loading.html
 # http://stackoverflow.com/a/3381582
 
-import imp
+
 import os
 
+try:
+    from .plugins_importlib import _Plugin
+except ImportError:
+    from .plugins_imp import _Plugin
+
 
 def load(plugin_dir, package=__name__):
     """
@@ -44,25 +49,27 @@ def load(plugin_dir, package=__name__):
     plugins = []
     for dirent in os.listdir(plugin_dir):
         # skip __init__.py
-        if dirent.startswith('__'):
+        if dirent.startswith("__"):
             continue
 
+        full_path = os.path.join(plugin_dir, dirent)
+
         # Load .py files as plugins
-        if dirent.endswith('.py'):
-            plugins.append(os.path.splitext(dirent)[0])
+        if dirent.endswith(".py"):
+            plugin_name = package + "." + os.path.splitext(dirent)[0]
+            plugins.append(_Plugin(plugin_name, full_path, plugin_dir))
             continue
 
         # Load directories containing __init__.py
-        full_path = os.path.join(plugin_dir, dirent)
         if os.path.isdir(full_path):
-            if os.path.isfile(os.path.join(full_path, '__init__.py')):
-                plugins.append(dirent)
+            plugin_name = package + "." + dirent
+            plugin_path = os.path.join(full_path, "__init__.py")
+            if os.path.isfile(plugin_path):
+                plugins.append(_Plugin(plugin_name, plugin_path, plugin_dir))
 
     # Now load the plugin modules
     modules = []
     for plugin in plugins:
-        f, path, desc = imp.find_module(plugin, [plugin_dir])
-        module = imp.load_module(package + '.' + plugin, f, path, desc)
-        modules.append(module)
+        modules.append(plugin.load())
 
     return modules