Skip to content

Commit

Permalink
Merge pull request #48 from capitalone/dev
Browse files Browse the repository at this point in the history
Release v2023.8.0
  • Loading branch information
Faisal authored Aug 29, 2023
2 parents 1228588 + a207cdc commit 101cc30
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 73 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/edgetest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
python-version: 3.10
6 changes: 3 additions & 3 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ 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
- name: Publish
uses: JamesIves/[email protected]
with:
branch: gh-pages
folder: docs/_build/html
folder: docs/_build/html
4 changes: 2 additions & 2 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ 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 }}
uses: actions/setup-python@v2
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
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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: 5.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
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @fdosani @ak-gupta
* @fdosani @ak-gupta @jdawang @gladysteh99 @NikhilJArora
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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/)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down
2 changes: 1 addition & 1 deletion docs/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion edgetest_conda/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Package initialization."""

__version__ = "2023.4.0"
__version__ = "2023.8.0"

__title__ = "edgetest-conda"
__description__ = "Conda edgetest plugin"
Expand Down
2 changes: 1 addition & 1 deletion edgetest_conda/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
25 changes: 0 additions & 25 deletions requirements.txt

This file was deleted.

45 changes: 22 additions & 23 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,56 @@ author_email = [email protected]
maintainer = Akshay Gupta
maintainer_email = [email protected]
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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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

0 comments on commit 101cc30

Please sign in to comment.