From 9a2f1caf0012d9ab937bd3cd31587d7321fc04f1 Mon Sep 17 00:00:00 2001 From: Ekin Dursun Date: Mon, 20 May 2024 11:07:05 +0300 Subject: [PATCH] Remove EOL Python versions --- .gitignore | 1 - HISTORY.rst | 4 ++++ README.md | 14 +++++++------- README.rst | 4 ++-- azdev.pyproj | 6 +++--- azdev/mod_templates/setup.py | 4 ++-- azure-cli-diff-tool/README.rst | 4 ++-- setup.py | 4 +--- tox.ini | 2 -- 9 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index aa26c7d98..8c066e00a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ env/ .vs/ src/aztool.egg-info/ -src/aztool/__pycache__/__init__.cpython-36.pyc src/aztool/__pycache__/ src/azdev.egg-info/* *.pyc diff --git a/HISTORY.rst b/HISTORY.rst index c957c0f54..7367d4001 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,10 @@ Release History =============== +Unreleased +++++++++++ +* Remove EOL Python versions, namely 3.6 and 3.7. + 0.1.68 ++++++ * `azdev command-change tree-export`: Add new command to support export command tree of CLI modules. diff --git a/README.md b/README.md index 1b09cf8c8..7bb22566c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The `azdev` tool is designed to aid new and experienced developers in contributi ## Setting up your development environment -1. Install Python 3.6/3.7/3.8 from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7. Currently it's not recommended to use Python 3.9. +1. Install Python 3.8/3.9/3.10 from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7. 2. Fork and clone the repository or repositories you wish to develop for. - For Azure CLI: https://github.com/Azure/azure-cli - For Azure CLI Extensions: https://github.com/Azure/azure-cli-extensions @@ -45,10 +45,10 @@ The `azdev` tool is designed to aid new and experienced developers in contributi See [Authenticating with GitHub from Git](https://docs.github.com/github/getting-started-with-github/set-up-git#next-steps-authenticating-with-github-from-git) about caching your GitHub credentials in Git which is needed when you push the code. - + 3. Create a new virtual environment for Python in the root of your clone. You can do this by running: - Python 3.6+ (all platforms): + Python 3.8+ (all platforms): ```BatchFile python -m venv env ``` @@ -84,11 +84,11 @@ The `azdev` tool is designed to aid new and experienced developers in contributi ``` For rpm packages: ```Bash - sudo yum install gcc python3-devel + sudo yum install gcc python3-devel ``` Otherwise you will have `psutil` installation issues (#269) when you setup `azure-cli` later. - + Upgrade `pip` on all platforms: ``` python -m pip install -U pip @@ -102,7 +102,7 @@ The `azdev` tool is designed to aid new and experienced developers in contributi ``` azdev setup ``` - + This will launch the interactive setup process. You can also run with non-interactive options: ``` azdev setup --cli /path/to/azure-cli --repo /path/to/azure-cli-extensions @@ -127,7 +127,7 @@ azdev extension add Run `az --help` with your command groups or commands for a quick check on the command interface and help messages. -For instructions on manually writing the commands and tests, see more in +For instructions on manually writing the commands and tests, see more in - [Authoring Command Modules](https://github.com/Azure/azure-cli/tree/dev/doc/authoring_command_modules) - [Authoring Extensions](https://github.com/Azure/azure-cli/blob/dev/doc/extensions/authoring.md) - [Authoring Tests](https://github.com/Azure/azure-cli/blob/dev/doc/authoring_tests.md) diff --git a/README.rst b/README.rst index aad88b2b8..11c27ed38 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ The ``azdev`` tool is designed to aid new and experienced developers in contribu Setting up your development environment +++++++++++++++++++++++++++++++++++++++ -1. Install Python 3.6+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7. +1. Install Python 3.8+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7. 2. Fork and clone the repository or repositories you wish to develop for. - For Azure CLI: https://github.com/Azure/azure-cli @@ -15,7 +15,7 @@ Setting up your development environment 3. Create a new virtual environment for Python in the root of your clone. You can do this by running: - Python 3.6+ (all platforms): + Python 3.8+ (all platforms): :: diff --git a/azdev.pyproj b/azdev.pyproj index 6d40c214d..4e2856c60 100644 --- a/azdev.pyproj +++ b/azdev.pyproj @@ -85,8 +85,8 @@ env - 3.6 - env (Python 3.6 (32-bit)) + 3.10 + env (Python 3.10 (32-bit)) Scripts\python.exe Scripts\pythonw.exe PYTHONPATH @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/azdev/mod_templates/setup.py b/azdev/mod_templates/setup.py index 001b7cd12..924af2ddd 100644 --- a/azdev/mod_templates/setup.py +++ b/azdev/mod_templates/setup.py @@ -26,9 +26,9 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ] diff --git a/azure-cli-diff-tool/README.rst b/azure-cli-diff-tool/README.rst index dd184d865..35e781957 100644 --- a/azure-cli-diff-tool/README.rst +++ b/azure-cli-diff-tool/README.rst @@ -6,11 +6,11 @@ The ``azure-cli-diff-tool`` is designed to aid azure-cli users in diffing metada Setting up your environment +++++++++++++++++++++++++++++++++++++++ -1. Install Python 3.6+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7. +1. Install Python 3.8+ from http://python.org. Please note that the version of Python that comes preinstalled on OSX is 2.7. 3. Create a new virtual environment for Python in the root of your clone. You can do this by running: - Python 3.6+ (all platforms): + Python 3.8+ (all platforms): :: diff --git a/setup.py b/setup.py index 150c3006e..f5e04fdc0 100644 --- a/setup.py +++ b/setup.py @@ -40,14 +40,12 @@ 'Environment :: Console', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10' ], keywords='azure', - python_requires='>=3.6', + python_requires='>=3.8', packages=[ 'azdev', 'azdev.config', diff --git a/tox.ini b/tox.ini index d9f5beb32..70a2878f6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,5 @@ [tox] envlist = - py36 - py37 py38 py39 py310