Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2022.12.0 #43

Merged
merged 3 commits into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/edgetest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: Run edgetest
on:
schedule:
- cron: '35 17 * * 5'
- cron: '35 17 * * 3'
jobs:
edgetest:
runs-on: ubuntu-latest
Expand All @@ -14,8 +14,9 @@ jobs:
with:
ref: dev
- id: run-edgetest
uses: fdosani/run-edgetest-action@v1.1
uses: fdosani/run-edgetest-action@v1.2
with:
edgetest-flags: '-c setup.cfg --export'
base-branch: 'dev'
skip-pr: 'false'
skip-pr: 'false'
python-version: 3.9
1 change: 1 addition & 0 deletions .github/workflows/test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- 3.7
- 3.8
- 3.9
- "3.10"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
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 = "2022.7.1"
version = "2022.12.0"
# The full version, including alpha/beta/rc tags
release = ""

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__ = "2022.7.1"
__version__ = "2022.12.0"

__title__ = "edgetest-conda"
__description__ = "Conda edgetest plugin"
Expand Down
10 changes: 6 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
#
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
# 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.7.0
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.8.10
tabulate==0.9.0
# via edgetest
tomlkit==0.11.4
# via edgetest

# The following packages are considered to be unsafe in a requirements file:
Expand Down
42 changes: 22 additions & 20 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ author_email = akshay.gupta2@capitalone.com
maintainer = Akshay Gupta
maintainer_email = akshay.gupta2@capitalone.com
url = https://github.com/capitalone/edgetest-conda
python_requires =
python_requires =
>=3.7.0
project_urls =
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
Expand All @@ -25,39 +25,40 @@ classifiers =
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

[options]
zip_safe = False
include_package_data = True
packages = find:
install_requires =
edgetest
install_requires =
edgetest<=2022.11.0,>=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 @@ -79,21 +80,21 @@ dev =
bumpver

[options.entry_points]
edgetest =
edgetest =
conda = edgetest_conda.plugin

[bumpver]
current_version = "2022.7.1"
current_version = "2022.12.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 @@ -116,7 +117,7 @@ use_parentheses = True
line_length = 88

[mypy]
python_version = 3.7
python_version = 3.9
warn_return_any = True
warn_unused_configs = True
ignore_missing_imports = True
Expand All @@ -126,16 +127,17 @@ 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 =
upgrade =
edgetest
extras =
extras =
tests
deps =
deps =
pip-tools

18 changes: 9 additions & 9 deletions tests/test_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
def test_addoption(config, tmpdir):
"""Test the addoption hook."""
location = tmpdir.mkdir("mylocation")
conf_loc = Path(str(location), "myconfig.ini")
conf_loc = Path(str(location), "myconfig.cfg")
with open(conf_loc, "w") as outfile:
outfile.write(config)

Expand Down Expand Up @@ -125,10 +125,10 @@ def test_conda_create(mock_popen, mock_cpopen):
runner = CliRunner()

with runner.isolated_filesystem() as loc:
with open("config.ini", "w") as outfile:
with open("config.cfg", "w") as outfile:
outfile.write(CFG)

result = runner.invoke(cli, ["--config=config.ini"])
result = runner.invoke(cli, ["--config=config.cfg"])

assert result.exit_code == 0

Expand Down Expand Up @@ -198,10 +198,10 @@ def test_conda_create_update_pip(mock_popen, mock_cpopen, CFG):
runner = CliRunner()

with runner.isolated_filesystem() as loc:
with open("config.ini", "w") as outfile:
with open("config.cfg", "w") as outfile:
outfile.write(CFG)

result = runner.invoke(cli, ["--config=config.ini"])
result = runner.invoke(cli, ["--config=config.cfg"])

assert result.exit_code == 0

Expand Down Expand Up @@ -265,10 +265,10 @@ def test_mamba_create(mock_popen, mock_cpopen):
runner = CliRunner()

with runner.isolated_filesystem() as loc:
with open("config.ini", "w") as outfile:
with open("config.cfg", "w") as outfile:
outfile.write(CFG)

result = runner.invoke(cli, ["--config=config.ini"])
result = runner.invoke(cli, ["--config=config.cfg"])

assert result.exit_code == 0

Expand Down Expand Up @@ -338,10 +338,10 @@ def test_mamba_create_update_pip(mock_popen, mock_cpopen, CFG):
runner = CliRunner()

with runner.isolated_filesystem() as loc:
with open("config.ini", "w") as outfile:
with open("config.cfg", "w") as outfile:
outfile.write(CFG)

result = runner.invoke(cli, ["--config=config.ini"])
result = runner.invoke(cli, ["--config=config.cfg"])

assert result.exit_code == 0

Expand Down