From 550107933ef013aec580084ab9c19fc9521c8568 Mon Sep 17 00:00:00 2001 From: Kirk Byers Date: Mon, 16 Dec 2024 11:10:36 -0800 Subject: [PATCH 1/2] Convert to Netmiko's versioned telnetlib --- lib/jnpr/junos/transport/tty_telnet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jnpr/junos/transport/tty_telnet.py b/lib/jnpr/junos/transport/tty_telnet.py index 057676c5a..6894f6698 100644 --- a/lib/jnpr/junos/transport/tty_telnet.py +++ b/lib/jnpr/junos/transport/tty_telnet.py @@ -1,5 +1,5 @@ from time import sleep -import telnetlib +from netmiko._telnetlib import telnetlib import logging import sys import six From 78a1ed15e2d03722894227f48228f41b90402b80 Mon Sep 17 00:00:00 2001 From: Kirk Byers Date: Mon, 16 Dec 2024 11:12:50 -0800 Subject: [PATCH 2/2] Drop PY3.8 support; Add PY3.13 support --- .github/workflows/pylint.yml | 2 +- README.md | 2 +- requirements.txt | 2 ++ setup.py | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index dce3b0b86..acf01f9cc 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest ] - python-version: [ 3.9, '3.10', 3.11, 3.12 ] + python-version: [ 3.9, '3.10', 3.11, 3.12, 3.13 ] exclude: - os: windows-latest python-version: 3.9 diff --git a/README.md b/README.md index 8747559a5..f9e357e0f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ _Junos PyEZ_ is designed to provide the same capabilities as a user would have o ## PIP -Installation requires Python >=3.8 and associated `pip` tool +Installation requires Python >=3.9 and associated `pip` tool pip install junos-eznc diff --git a/requirements.txt b/requirements.txt index 16937fa40..3987aa123 100755 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,8 @@ scp>=0.7.0 jinja2>=2.7.1 PyYAML>=5.1 paramiko>=3.5.0 +# needed to support telnetlib (i.e. Netmiko vendored telnetlib internally) +netmiko>=4.4.0 six pyserial yamlordereddictloader diff --git a/setup.py b/setup.py index 6bf18bed6..c2e7a10ee 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ "jnpr.junos.cfgro": ["*.yml"], "jnpr.junos.resources": ["*.yml"], }, - python_requires=">=3.8", + python_requires=">=3.9", install_requires=install_reqs, classifiers=[ "Development Status :: 5 - Production/Stable", @@ -37,11 +37,11 @@ "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Application Frameworks", "Topic :: Software Development :: Libraries :: Python Modules",