Merge branch 'py3_13' into 'master'

PyTiger 2.0.0

See merge request tcl/pytiger!3

Author: bootc

.gitlab-ci.yml

@@ -6,23 +6,10 @@ stages:
 .build_template: &build_template
   stage: build
   script:
-    - pip install -r requirements.txt
     - pip install coverage flake8 mock pytest pytest-cov
     # - python3 setup.py check -mrs
     - flake8 src/pytiger
-    - pytest --cov pytiger src/pytiger
-
-build-py2.7:
-  <<: *build_template
-  image: python:2.7
-
-build-py3.4:
-  <<: *build_template
-  image: python:3.4
-
-build-py3.5:
-  <<: *build_template
-  image: python:3.5
+    - pytest
 
 build-py3.6:
   <<: *build_template
@@ -52,11 +39,14 @@ build-py3.12:
   <<: *build_template
   image: python:3.12
 
+build-py3.13:
+  <<: *build_template
+  image: python:3.13
+
 pages:
   stage: build
-  image: python:3.12
+  image: python:3.13
   script:
-    - pip install -r requirements.txt
     - pip install sphinx
     - sphinx-build docs public
   artifacts:
@@ -105,13 +95,11 @@ rpm-source:
   before_script:
     - 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
-        ${rpm_scl:+${rpm_scl}-build}
     - |
       yum -y install $( \
         rpmbuild --rebuild *.src.rpm 2>&1 | \
@@ -127,16 +115,6 @@ rpm-source:
     paths:
       - "*.rpm"
 
-epel-7-x86_64:
-  extends: .rpm-binary-template
-  image: centos:7
-
-epel-7-sclpy36-x86_64:
-  extends: .rpm-binary-template
-  image: centos:7
-  variables:
-    rpm_scl: rh-python36
-
 el-8-x86_64:
   extends: .rpm-binary-template
   image: rockylinux:8

.travis.yml

@@ -1,8 +1,6 @@
 # pytiger
 
-[![Build Status](https://travis-ci.org/tigercomputing/pytiger.svg?branch=master)](https://travis-ci.org/tigercomputing/pytiger)
 [![Documentation Status](https://readthedocs.org/projects/pytiger/badge/?version=latest)](http://pytiger.readthedocs.io/en/latest/?badge=latest)
-[![Coverage Status](https://coveralls.io/repos/github/tigercomputing/pytiger/badge.svg?branch=master)](https://coveralls.io/github/tigercomputing/pytiger?branch=master)
 
 pytiger is the Tiger Computing Ltd python utility library.
 

README.md

@@ -9,22 +9,8 @@ Debian
 ======
 
 Use standard build mechanisms such as ``dpkg-buildpackage``, ``debuild``,
-``pbuilder`` or whatever works for you. The ``debian/`` directory is intended
-to track the current release of Debian at the time of the release of PyTiger.
-At the time of writing, this is
-`Debian 10 (buster) <https://www.debian.org/releases/stable/>`_.
-
-For example:
-
-.. code-block:: console
-
-  $ debuild -us -uc
-  [...]
-  dpkg-genchanges: including full source code in upload
-   dpkg-source --after-build pytiger
-  dpkg-buildpackage: full upload; Debian-native package (full source is included)
-  Now running lintian...
-  Finished running lintian.
+``pbuilder`` or whatever works for you. The ``debian/`` directory is available
+in branches prefixed ``debian/`` in Git.
 
 We strongly recommend using ``pbuilder`` or ``sbuild`` or similar mechanisms in
 order that packages are built in a clean, reproducible environment so that no
@@ -37,107 +23,10 @@ Red Hat & CentOS
 Packages targeting the "native" python versions for Red Hat or CentOS can be
 built using standard tools such as ``rpmbuild`` or `Mock
 <https://github.com/rpm-software-management/mock/wiki>`_ with no specific
-configuration. The supplied spec file will generate:
-
-* on Red Hat / CentOS 6.x:
-
-  * ``python2-pytiger`` for Python 2.6
-
-* on Red Hat / CentOS 7.x:
-
-  * ``python2-pytiger`` for Python 2.7
-  * ``python34-pytiger`` for Python 3.4
-
-For example:
-
-.. code-block:: console
-
-  $ rpmbuild -bs pytiger.spec
-  Wrote: /path/to/rpmbuild/SRPMS/pytiger-1.1.0-1.el7.centos.src.rpm
-  $ mock -r epel-7-x86_64 --rebuild /path/to/rpmbuild/SRPMS/pytiger-1.1.0-1.el7.centos.src.rpm
-  [...]
-  Finish: rpmbuild pytiger-1.1.0-1.el7.centos.src.rpm
-  Finish: build phase for pytiger-1.1.0-1.el7.centos.src.rpm
-  INFO: Done(/path/to/rpmbuild/SRPMS/pytiger-1.1.0-1.el7.centos.src.rpm) Config(epel-7-x86_64) 3 minutes 4 seconds
-  INFO: Results and/or logs in: /var/lib/mock/epel-7-x86_64/result
-  Finish: run
+configuration. The supplied spec file will generate the ``python3-pytiger``
+RPM.
 
 We strongly recommend using ``mock`` or similar mechanisms in order that
 packages are built in a clean, reproducible environment so that no unexpected
 dependencies are pulled in and to avoid having to install all build
 dependencies on your build systems.
-
-In addition, the same spec file can be used to build RPM packages for Python
-versions packaged in `Software Collections
-<https://www.softwarecollections.org>`_, but this requires specially prepared
-chroots that have the SCL Python packages included in them. The `Red Hat Blog
-<http://developers.redhat.com/blog/>`_ has `some instructions about this
-<http://developers.redhat.com/blog/2015/01/07/using-mock-to-build-python27-software-collections-packages-for-rhel6/>`_
-covering SCL Python 2.7 on CentOS 6. Once you have a specially prepared chroot
-for the SCL Python version you require, just build the package in that chroot
-using the usual mock commands.
-
-The following configurations are supported:
-
-* on Red Hat / CentOS 6.x:
-
-  * SCL Python 2.7, creating ``python27-pytiger`` (``sclpy27``)
-  * SCL Python 3.4, creating ``rh-python34-pytiger`` (``sclpy34``)
-
-The mock configurations we use for these are:
-
-For CentOS 6 with SCL Python 2.7 (``sclpy27``):
-
-.. code-block:: diff
-
-  --- epel-6-x86_64.cfg	2016-09-13 10:10:00.000000000 +0100
-  +++ epel-6-sclpy27-x86_64.cfg	2016-10-11 16:03:41.470227420 +0100
-  @@ -1,7 +1,7 @@
-  -config_opts['root'] = 'epel-6-x86_64'
-  +config_opts['root'] = 'epel-6-sclpy27-x86_64'
-   config_opts['target_arch'] = 'x86_64'
-   config_opts['legal_host_arches'] = ('x86_64',)
-  -config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-  +config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build python27-build'
-   config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
-   # beware RHEL use 6Server or 6Client
-   config_opts['releasever'] = '6'
-  @@ -61,4 +61,10 @@
-   mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=x86_64
-   failovermethod=priority
-   enabled=0
-  +
-  +[python27scl]
-  +name=Python27 - epel-6-x86_64
-  +baseurl=https://www.softwarecollections.org/repos/rhscl/python27/epel-6-x86_64
-  +enabled=1
-  +gpgcheck=0
-   """
-
-For CentOS 6 with SCL Python 3.4 (``sclpy34``):
-
-.. code-block:: diff
-
-  --- epel-6-x86_64.cfg	2016-09-13 10:10:00.000000000 +0100
-  +++ epel-6-sclpy34-x86_64.cfg	2016-11-14 16:50:34.543356289 +0000
-  @@ -1,7 +1,7 @@
-  -config_opts['root'] = 'epel-6-x86_64'
-  +config_opts['root'] = 'epel-6-sclpy34-x86_64'
-   config_opts['target_arch'] = 'x86_64'
-   config_opts['legal_host_arches'] = ('x86_64',)
-  -config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-  +config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build rh-python34-build'
-   config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
-   # beware RHEL use 6Server or 6Client
-   config_opts['releasever'] = '6'
-  @@ -61,4 +61,10 @@
-   mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=x86_64
-   failovermethod=priority
-   enabled=0
-  +
-  +[python34scl]
-  +name=Python34 - epel-6-x86_64
-  +baseurl=https://www.softwarecollections.org/repos/rhscl/rh-python34/epel-6-x86_64
-  +enabled=1
-  +gpgcheck=0
-   """

TODO

@@ -2,6 +2,17 @@
 Changes in pytiger
 ******************
 
+Release 2.0.0
+=============
+
+ * Drop Python 2 compatibility. The minimum supported Python version is now
+   3.6.
+ * Remove all CentOS 7 packages, including SCL.
+ * Remove deprecated :mod:`pytiger.logging.legacy` module.
+ * Remove deprecated :mod:`pytiger.nagios` module.
+ * Remove deprecated :func:`pytiger.monitoring.MonitoringCheck.warn` method.
+ * Fix :mod:`pytiger.logging.config` Python 3.13 compatibility.
+
 Release 1.2.2
 =============
 

docs/building.rst

@@ -49,16 +49,16 @@
 
 # General information about the project.
 project = u'pytiger'
-copyright = u'2015-2018, Tiger Computing Ltd'
+copyright = u'2015-2025, Tiger Computing Ltd'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.2'
+release = '2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -202,7 +202,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'pytiger.tex', u'pytiger Documentation',
-   u'Jonathan Wiltshire', 'manual'),
+   u'Tiger Computing Ltd', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

docs/changes.rst

@@ -7,7 +7,7 @@ Contributions to pytiger are welcome, but should follow some guidelines.
 Python Interpreter Version
 ==========================
 
-Python code should be backward-compatible to version 2.7 of the Python
+Python code should be backward-compatible to version 3.6 of the Python
 interpreter. This is subject to change as the major distributions we
 support change.
 

docs/conf.py

@@ -14,7 +14,6 @@ Contents:
    introduction
    logging
    monitoring
-   nagios
    utils
 
    contributing

docs/contributing.rst

@@ -17,22 +17,3 @@ Logging
 .. automodule:: pytiger.logging.syslog
    :synopsis: Syslog logging handler for Python logging framework
    :members:
-
-:mod:`pytiger.logging.legacy` -- Legacy logging module
-======================================================
-
-.. automodule:: pytiger.logging.legacy
-   :synopsis: Legacy logging utilities
-   :deprecated:
-
-.. autoclass:: LegacySyslogger
-
-   .. autoattribute:: log_level
-   .. autoattribute:: log_to_stdout
-   .. autoattribute:: log_to_syslog
-
-   .. automethod:: log
-   .. automethod:: debug
-   .. automethod:: error
-   .. automethod:: info
-   .. automethod:: warning