mirror of
https://github.com/GNS3/gns3-server
synced 2025-01-13 17:40:54 +00:00
Merge pull request #2353 from GNS3/feature/drop-python-3.6
Drop Python 3.6 support
This commit is contained in:
commit
4fa10be5aa
4
.github/workflows/testing.yml
vendored
4
.github/workflows/testing.yml
vendored
@ -13,10 +13,10 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
||||||
runs-on: ubuntu-20.04 # Downgrade Ubuntu to 20.04 to fix missing Python 3.6
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
|
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
@ -235,9 +235,9 @@ def run():
|
|||||||
return
|
return
|
||||||
log.info("HTTP authentication is enabled with username '{}'".format(user))
|
log.info("HTTP authentication is enabled with username '{}'".format(user))
|
||||||
|
|
||||||
# we only support Python 3 version >= 3.6
|
# we only support Python 3 version >= 3.7
|
||||||
if sys.version_info < (3, 6, 0):
|
if sys.version_info < (3, 7, 0):
|
||||||
raise SystemExit("Python 3.6 or higher is required")
|
raise SystemExit("Python 3.7 or higher is required")
|
||||||
|
|
||||||
user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
|
user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
|
||||||
micro=sys.version_info[2], pid=os.getpid()))
|
micro=sys.version_info[2], pid=os.getpid()))
|
||||||
|
@ -1,12 +1,9 @@
|
|||||||
jsonschema>=4.17.3,<4.18; python_version >= '3.7' # v4.17.3 is the last version to support Python 3.7
|
jsonschema>=4.17.3,<4.18 # v4.17.3 is the last version to support Python 3.7
|
||||||
jsonschema==3.2.0; python_version < '3.7' # v3.2.0 is the last version to support Python 3.6
|
aiohttp>=3.8.6,<3.9; python_version == '3.7' # v3.8.6 is the last version to support Python 3.7
|
||||||
aiohttp>=3.8.5,<3.9; python_version <= '3.7'
|
|
||||||
aiohttp>=3.9.0,<3.10; python_version > '3.7'
|
aiohttp>=3.9.0,<3.10; python_version > '3.7'
|
||||||
aiohttp-cors>=0.7.0,<0.8
|
aiohttp-cors>=0.7.0,<0.8
|
||||||
aiofiles>=23.2.1,<23.3; python_version >= '3.7'
|
aiofiles>=23.2.1,<23.3
|
||||||
aiofiles==0.8.0; python_version < '3.7' # v0.8.0 is the last version to support Python 3.6
|
Jinja2>=3.1.2,<3.2
|
||||||
Jinja2>=3.1.2,<3.2; python_version >= '3.7'
|
|
||||||
Jinja2==3.0.3; python_version < '3.7' # v3.0.3 is the last version to support Python 3.6
|
|
||||||
sentry-sdk==1.39.2,<1.40
|
sentry-sdk==1.39.2,<1.40
|
||||||
psutil==5.9.8
|
psutil==5.9.8
|
||||||
async-timeout>=4.0.2,<4.1
|
async-timeout>=4.0.2,<4.1
|
||||||
@ -15,5 +12,4 @@ py-cpuinfo>=9.0.0,<10.0
|
|||||||
platformdirs>=2.4.0
|
platformdirs>=2.4.0
|
||||||
importlib-resources>=1.3; python_version < '3.9'
|
importlib-resources>=1.3; python_version < '3.9'
|
||||||
truststore>=0.8.0; python_version >= '3.10'
|
truststore>=0.8.0; python_version >= '3.10'
|
||||||
setuptools>=60.8.1; python_version >= '3.7'
|
setuptools>=60.8.1
|
||||||
setuptools==59.6.0; python_version < '3.7' # v59.6.0 is the last version to support Python 3.6
|
|
||||||
|
9
setup.py
9
setup.py
@ -23,9 +23,9 @@ import subprocess
|
|||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
from setuptools.command.test import test as TestCommand
|
from setuptools.command.test import test as TestCommand
|
||||||
|
|
||||||
# we only support Python 3 version >= 3.5.3
|
# we only support Python 3 version >= 3.7
|
||||||
if len(sys.argv) >= 2 and sys.argv[1] == "install" and sys.version_info < (3, 5, 3):
|
if len(sys.argv) >= 2 and sys.argv[1] == "install" and sys.version_info < (3, 7):
|
||||||
raise SystemExit("Python 3.5.3 or higher is required")
|
raise SystemExit("Python 3.7 or higher is required")
|
||||||
|
|
||||||
|
|
||||||
class PyTest(TestCommand):
|
class PyTest(TestCommand):
|
||||||
@ -89,7 +89,7 @@ setup(
|
|||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
platforms="any",
|
platforms="any",
|
||||||
python_requires='>=3.6.0',
|
python_requires='>=3.7',
|
||||||
setup_requires=["setuptools>=17.1"],
|
setup_requires=["setuptools>=17.1"],
|
||||||
classifiers=[
|
classifiers=[
|
||||||
"Development Status :: 5 - Production/Stable",
|
"Development Status :: 5 - Production/Stable",
|
||||||
@ -103,7 +103,6 @@ setup(
|
|||||||
"Operating System :: Microsoft :: Windows",
|
"Operating System :: Microsoft :: Windows",
|
||||||
"Programming Language :: Python",
|
"Programming Language :: Python",
|
||||||
"Programming Language :: Python :: 3 :: Only",
|
"Programming Language :: Python :: 3 :: Only",
|
||||||
"Programming Language :: Python :: 3.6",
|
|
||||||
"Programming Language :: Python :: 3.7",
|
"Programming Language :: Python :: 3.7",
|
||||||
"Programming Language :: Python :: 3.8",
|
"Programming Language :: Python :: 3.8",
|
||||||
"Programming Language :: Python :: 3.9",
|
"Programming Language :: Python :: 3.9",
|
||||||
|
Loading…
Reference in New Issue
Block a user