Merge pull request #618 from asmacdo/resurrection-2025

Resurrection 2025

Author: yarikoptic

.github/workflows/test.yml

@@ -17,35 +17,35 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python: "3.10"
+          - python: "3.9"
             install_datalad: datalad
             # install_condor: condor
-            # 20.04 for condor
-            os: ubuntu-20.04
+            # TODO 20.04 may be needed for condor
+            os: ubuntu-22.04
             reproman_tests_deps: full
             reproman_tests_ssh: ssh
             reproman_tests_assume_ssp: ssp
             setup_slurm: slurm
-          - python: "3.8"
+          - python: "3.10"
             os: ubuntu-22.04
             # By default no logs will be output. This one is to test
             # with low level but dumped to /dev/null
             reproman_loglevel: INFO
             reproman_tests_deps: core
-          - python: "3.9"
+          - python: "3.11"
             os: ubuntu-22.04
             # By default no logs will be output. This one is to test
             # with low level but dumped to /dev/null
             reproman_loglevel: 2
             reproman_logtarget: /dev/null
             reproman_tests_deps: full-except-datalad
-          - python: "3.9"
+          - python: "3.12"
             os: ubuntu-22.04
             # must operate nicely with those env variables set
             set_http_proxy: http_proxy
             reproman_tests_deps: full-except-datalad
             reproman_tests_nonetwork: nonetwork
-          - python: 3.8
+          - python: "3.11"
             os: ubuntu-22.04
             reproman_tests_deps: full-except-datalad
     steps:

.gitignore

@@ -17,6 +17,7 @@ tmp
 *.egg-info
 .eggs/
 *.py[coe]
+__pycache__/
 *.bak
 .#*
 .orig

README.md

@@ -27,7 +27,7 @@ internals and/or contributing to the project.
 
 # Installation
 
-ReproMan requires Python 3 (>= 3.8).
+ReproMan requires Python 3 (>= 3.9).
 
 ## Linux'es and OSX (Windows yet TODO) - via pip
 
@@ -54,7 +54,7 @@ all necessary packages from that repository.
 
 ## Dependencies
 
-Python 3.8+ **with header files** possibly needed to build some extensions without wheels. They are provided by `python3-dev` on
+Python 3.9+ **with header files** possibly needed to build some extensions without wheels. They are provided by `python3-dev` on
 debian-based systems or `python-devel` on Red Hat systems.
 
 Our `setup.py` and corresponding packaging describes all necessary python dependencies.

reproman/distributions/redhat.py

@@ -303,8 +303,7 @@ def _find_all_sources(self):
         # Get all repo info from the system and store information for each
         # enabled repo in a RPMSource object.
         # '-y' included in case there are GPG keys to import
-        out, _ = self._session.execute_command(['yum', '--verbose',
-            'repolist', '-y'])
+        out, _ = self._session.execute_command(['yum', 'repolist', '-y'])
         for line in out.splitlines():
             if line.startswith('Repo-'):
                 key, value = line.split(':', 1)

reproman/tests/test_cmdline_main.py

@@ -53,17 +53,9 @@ def run_main(args, exit_code=0, expect_stderr=False):
     return stdout, stderr
 
 
-# TODO: switch to stdout for --version output
 def test_version():
     stdout, stderr = run_main(['--version'], expect_stderr=True)
-
-    # and output should contain our version, copyright, license
-
-    # https://hg.python.org/cpython/file/default/Doc/whatsnew/3.4.rst#l1952
-    out = stdout if sys.version_info >= (3, 4) else stderr
-    ok_startswith(out, 'reproman %s\n' % reproman.__version__)
-    in_("Copyright", out)
-    in_("Permission is hereby granted", out)
+    ok_startswith(stdout, f'reproman {reproman.__version__}')
 
 
 def test_help_np():

setup.py

@@ -157,7 +157,7 @@ def findsome(subdir, extensions):
     # python3 -m pip install --user --upgrade setuptools wheel twine
     long_description_content_type='text/markdown',
     packages=reproman_pkgs,
-    python_requires='>=3.8',
+    python_requires='>=3.9',
     install_requires=requires['core'],
     extras_require=requires,
     entry_points={

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34
+envlist = py39,py310,py311,py312
 #,flake8
 
 [testenv]