From e501425201d23c720e0b24012c31faf589d51d51 Mon Sep 17 00:00:00 2001 From: Faisal Date: Mon, 28 Aug 2023 14:43:44 -0300 Subject: [PATCH 1/2] Python bump to min 3.8 (#47) * bumping versions in action files * bumping Python versions * Bump 2023.4.0 to 2023.8.0 * removing requirements.txt * removing requirements.txt * removing requirements.txt * updating Python versions * Update README.md * Update .pre-commit-config.yaml * Update .pre-commit-config.yaml --- .github/workflows/edgetest.yml | 4 +-- .github/workflows/publish-docs.yml | 6 ++-- .github/workflows/publish-package.yml | 4 +-- .github/workflows/test-package.yml | 4 +-- .pre-commit-config.yaml | 16 +++++----- CODEOWNERS | 2 +- README.md | 8 +++-- docs/source/conf.py | 2 +- docs/source/quickstart.rst | 2 +- edgetest_conda/__init__.py | 2 +- edgetest_conda/plugin.py | 2 +- requirements.txt | 25 --------------- setup.cfg | 45 +++++++++++++-------------- 13 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 requirements.txt diff --git a/.github/workflows/edgetest.yml b/.github/workflows/edgetest.yml index ec0ea71..056139d 100644 --- a/.github/workflows/edgetest.yml +++ b/.github/workflows/edgetest.yml @@ -14,9 +14,9 @@ jobs: with: ref: dev - id: run-edgetest - uses: fdosani/run-edgetest-action@v1.2 + uses: fdosani/run-edgetest-action@v1.3 with: edgetest-flags: '-c setup.cfg --export' base-branch: 'dev' skip-pr: 'false' - python-version: 3.9 \ No newline at end of file + python-version: 3.10 diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index e69122c..a4b1ddc 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -19,9 +19,9 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - name: Install dependencies - run: python -m pip install -r requirements.txt .[dev] + run: python -m pip install .[dev] - name: Build run: make sphinx shell: bash @@ -29,4 +29,4 @@ jobs: uses: JamesIves/github-pages-deploy-action@4.0.0 with: branch: gh-pages - folder: docs/_build/html \ No newline at end of file + folder: docs/_build/html diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index c8c5497..ca2b3e2 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -18,9 +18,9 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - name: Install dependencies - run: python -m pip install -r requirements.txt .[dev] + run: python -m pip install .[dev] - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index b81119e..b0c5dd0 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -16,10 +16,10 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] python-version: - - 3.7 - 3.8 - 3.9 - "3.10" + - "3.11" steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -27,7 +27,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: python -m pip install -r requirements.txt .[dev] + run: python -m pip install .[dev] - name: Check docstrings run: python -m pydocstyle edgetest_conda --convention=numpy - name: Check static typing diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40cde85..a6d752a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,28 +1,28 @@ exclude: ^notebooks/ repos: - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 23.7.0 hooks: - id: black types: [file, python] - language_version: python3.9 - - repo: https://github.com/pre-commit/mirrors-isort - rev: v5.5.4 + language_version: python3.10 + - repo: https://github.com/PyCQA/isort + rev: v5.12.0 hooks: - id: isort - repo: https://github.com/pycqa/flake8 - rev: 3.8.3 + rev: 6.1.0 hooks: - id: flake8 additional_dependencies: [flake8-docstrings] files: ^edgetest_conda/ - language_version: python3.9 + language_version: python3.10 - repo: https://github.com/jazzband/pip-tools - rev: 6.8.0 + rev: 7.3.0 hooks: - id: pip-compile - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: debug-statements diff --git a/CODEOWNERS b/CODEOWNERS index 57fdb9c..53ed855 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @fdosani @ak-gupta \ No newline at end of file +* @fdosani @ak-gupta @jdawang @gladysteh99 @NikhilJArora diff --git a/README.md b/README.md index 7de457f..c79c48d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Conda edgetest plugin -![python-3.7](https://img.shields.io/badge/python-3.7-green.svg) +![PyPI - Python Version](https://img.shields.io/pypi/pyversions/edgetest-conda) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black) +[![PyPI version](https://badge.fury.io/py/edgetest-conda.svg)](https://badge.fury.io/py/edgetest-conda) +[![Anaconda-Server Badge](https://anaconda.org/conda-forge/edgetest-conda/badges/version.svg)](https://anaconda.org/conda-forge/edgetest-conda) [Full Documentation](https://capitalone.github.io/edgetest-conda/) @@ -50,12 +52,12 @@ as well as the python version for your environment(s): [edgetest.envs.myenv] conda_install = graphviz -python_version = 3.8 +python_version = 3.10 upgrade = myupgrade ``` -**NOTE**: The default python version is 3.7. +**NOTE**: The default python version is 3.10. Contributing diff --git a/docs/source/conf.py b/docs/source/conf.py index b14bfc9..5511097 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -25,7 +25,7 @@ author = "Akshay Gupta" # The short X.Y version -version = "2023.4.0" +version = "2023.8.0" # The full version, including alpha/beta/rc tags release = "" diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst index b3bf89c..0e5f2bb 100644 --- a/docs/source/quickstart.rst +++ b/docs/source/quickstart.rst @@ -40,7 +40,7 @@ you will need to modify the configuration file: [edgetest.envs.myenv] conda_install = graphviz - python_version = 3.8 + python_version = 3.10 upgrade = myupgrade update_with_conda = True diff --git a/edgetest_conda/__init__.py b/edgetest_conda/__init__.py index 4891f76..6f3a5d7 100644 --- a/edgetest_conda/__init__.py +++ b/edgetest_conda/__init__.py @@ -1,6 +1,6 @@ """Package initialization.""" -__version__ = "2023.4.0" +__version__ = "2023.8.0" __title__ = "edgetest-conda" __description__ = "Conda edgetest plugin" diff --git a/edgetest_conda/plugin.py b/edgetest_conda/plugin.py index 73bcb29..ba0b3fd 100644 --- a/edgetest_conda/plugin.py +++ b/edgetest_conda/plugin.py @@ -38,7 +38,7 @@ def to_bool(x): }, ) schema.add_envoption( - "python_version", {"type": "string", "default": "3.7", "coerce": str} + "python_version", {"type": "string", "default": "3.10", "coerce": str} ) schema.add_envoption( "update_with_conda", diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9d61fc4..0000000 --- a/requirements.txt +++ /dev/null @@ -1,25 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --output-file=requirements.txt setup.cfg -# -cerberus==1.3.4 - # via edgetest -click==8.1.3 - # via edgetest -edgetest==2022.11.0 - # via edgetest-conda (setup.cfg) -packaging==21.3 - # via edgetest -pluggy==1.0.0 - # via edgetest -pyparsing==3.0.9 - # via packaging -tabulate==0.9.0 - # via edgetest -tomlkit==0.11.4 - # via edgetest - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/setup.cfg b/setup.cfg index a294a06..c637b25 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,56 +9,56 @@ author_email = akshay.gupta2@capitalone.com maintainer = Akshay Gupta maintainer_email = akshay.gupta2@capitalone.com url = https://github.com/capitalone/edgetest-conda -python_requires = - >=3.7.0 -project_urls = +python_requires = + >=3.8.0 +project_urls = Documentation = https://capitalone.github.io/edgetest-conda Bug Tracker = https://github.com/capitalone/edgetest-conda/issues Source Code = https://github.com/capitalone/edgetest-conda -classifiers = +classifiers = Intended Audience :: Developers Natural Language :: English Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] zip_safe = False include_package_data = True packages = find: -install_requires = +install_requires = edgetest>=2022.3.0 [options.extras_require] -docs = +docs = furo sphinx sphinx-copybutton sphinx-tabs -tests = +tests = coverage flake8 mypy pydocstyle pytest pytest-cov -qa = +qa = black isort pip-tools pre-commit pylint -build = +build = build twine wheel bumpver -dev = +dev = coverage flake8 mypy @@ -80,21 +80,21 @@ dev = bumpver [options.entry_points] -edgetest = +edgetest = conda = edgetest_conda.plugin [bumpver] -current_version = "2023.4.0" +current_version = "2023.8.0" version_pattern = "YYYY.MM.INC0" commit_message = "Bump {old_version} to {new_version}" commit = True [bumpver:file_patterns] -docs/source/conf.py = +docs/source/conf.py = version = "{version}" -setup.cfg = +setup.cfg = current_version = "{version}" -edgetest_conda/__init__.py = +edgetest_conda/__init__.py = __version__ = "{version}" [aliases] @@ -117,7 +117,7 @@ use_parentheses = True line_length = 88 [mypy] -python_version = 3.9 +python_version = 3.10 warn_return_any = True warn_unused_configs = True ignore_missing_imports = True @@ -127,17 +127,16 @@ allow_redefinition = True pylint_minimum_score = 9.5 [tool:pytest] -markers = +markers = unit: mark unit tests that do not require external interfaces and use mocking integration: mark test that interact with an external system addopts = --verbose [edgetest.envs.core] -python_version = 3.9 -upgrade = +python_version = 3.10 +upgrade = edgetest -extras = +extras = tests -deps = +deps = pip-tools - From a207cdc78ba6c916ce465a4ab2f124c7ac4b3601 Mon Sep 17 00:00:00 2001 From: Faisal Date: Mon, 28 Aug 2023 15:20:51 -0300 Subject: [PATCH 2/2] fix v typo (#49) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a6d752a..c7714a4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: types: [file, python] language_version: python3.10 - repo: https://github.com/PyCQA/isort - rev: v5.12.0 + rev: 5.12.0 hooks: - id: isort - repo: https://github.com/pycqa/flake8