Skip to content

Commit 677c035

Browse files
committed
Drop support for Python <=3.7
1 parent ec8be76 commit 677c035

File tree

5 files changed

+8
-34
lines changed

5 files changed

+8
-34
lines changed

.github/workflows/nosetests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest]
11-
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
12-
include:
13-
- os: ubuntu-20.04
14-
python-version: '3.6'
11+
python-version: ['3.8', '3.9', '3.10', '3.11']
1512
name: Tests with Python ${{ matrix.python-version }}
1613
steps:
1714
- uses: actions/checkout@v3

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Requirements
2020

2121
* GNU/Linux, BSD, Mac OS X
2222
* OpenSSH (ssh/scp) or rsh
23-
* Python 2.x (x >= 7) or Python 3.x (x >= 6)
23+
* Python >=3.8
2424
* PyYAML
2525

2626
License

doc/sphinx/install.rst

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,10 @@ For instance, ClusterShell is known to work on the following operating systems:
2727

2828
* GNU/Linux
2929

30-
* Red Hat Enterprise Linux 7 (Python 2.7)
31-
32-
* Red Hat Enterprise Linux 8 (Python 3.6)
33-
3430
* Red Hat Enterprise Linux 9 (Python 3.9)
3531

3632
* Fedora 30 and above (Python 2.7 to 3.10+)
3733

38-
* Debian 10 "buster" (Python 3.7)
39-
4034
* Debian 11 "bullseye" (Python 3.9)
4135

4236
* Ubuntu 20.04 (Python 3.8)
@@ -68,22 +62,10 @@ ClusterShell packages as found in some common Linux distributions:
6862
| Operating | System Python version used | Alternate Python support |
6963
| System | by the clustershell tools | packaged (version-suffixed tools) |
7064
+==================+============================+===================================+
71-
| RHEL 7 | Python 2.7 | Python 3.6 |
72-
+------------------+----------------------------+-----------------------------------+
73-
| RHEL 8 | **Python 3.6** | |
74-
+------------------+----------------------------+-----------------------------------+
7565
| RHEL 9 | **Python 3.9** | |
7666
+------------------+----------------------------+-----------------------------------+
7767
| Fedora 36 | **Python 3.10** | |
7868
+------------------+----------------------------+-----------------------------------+
79-
| openSUSE Leap 15 | Python 2.7 | Python 3.6 |
80-
+------------------+----------------------------+-----------------------------------+
81-
| SUSE SLES 12 | Python 2.7 | Python 3.4 |
82-
+------------------+----------------------------+-----------------------------------+
83-
| SUSE SLES 15 | Python 2.7 | Python 3.6 |
84-
+------------------+----------------------------+-----------------------------------+
85-
| Ubuntu 18.04 LTS | **Python 3.6** | |
86-
+------------------+----------------------------+-----------------------------------+
8769
| Ubuntu 20.04 LTS | **Python 3.8** | |
8870
+------------------+----------------------------+-----------------------------------+
8971

lib/ClusterShell/CLI/Display.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,11 @@ def __init__(self, options, config=None, color=None):
118118
self._color = color
119119
# GH#528 enable line buffering
120120
self.out = sys.stdout
121-
try :
122-
if not self.out.line_buffering:
123-
self.out.reconfigure(line_buffering=True)
124-
except AttributeError: # < py3.7
125-
pass
121+
if not self.out.line_buffering:
122+
self.out.reconfigure(line_buffering=True)
126123
self.err = sys.stderr
127-
try :
128-
if not self.err.line_buffering:
129-
self.err.reconfigure(line_buffering=True)
130-
except AttributeError: # < py3.7
131-
pass
124+
if not self.err.line_buffering:
125+
self.err.reconfigure(line_buffering=True)
132126

133127
if self._color:
134128
self.color_stdout_fmt = self.COLOR_STDOUT_FMT

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,12 @@
8585
"Operating System :: POSIX :: BSD",
8686
"Operating System :: POSIX :: Linux",
8787
"Programming Language :: Python",
88-
"Programming Language :: Python :: 2.7",
8988
"Programming Language :: Python :: 3",
89+
"Programming Language :: Python :: 3 :: Only",
9090
"Topic :: Software Development :: Libraries :: Python Modules",
9191
"Topic :: System :: Clustering",
9292
"Topic :: System :: Distributed Computing"
9393
],
94+
python_requires='>=3.8',
9495
install_requires=REQUIRES,
9596
)

0 commit comments

Comments
 (0)