From d6ef29e7bc15ecf724148a2d7f03220c7274620a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 14:46:12 -0300 Subject: [PATCH 1/2] [create-pull-request] automated change (#41) Co-authored-by: fdosani --- setup.cfg | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/setup.cfg b/setup.cfg index 160f398..20aa13d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -30,34 +30,34 @@ classifiers = zip_safe = False include_package_data = True packages = find: -install_requires = +install_requires = edgetest [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 @@ -79,7 +79,7 @@ dev = bumpver [options.entry_points] -edgetest = +edgetest = conda = edgetest_conda.plugin [bumpver] @@ -89,11 +89,11 @@ 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] @@ -126,16 +126,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 + From b0ded2615913507177506010d041f50623a4b8f6 Mon Sep 17 00:00:00 2001 From: Faisal Date: Wed, 4 Jan 2023 14:19:31 -0400 Subject: [PATCH 2/2] Bump versions (#42) * updating action versions * adding 3.10 to metadata * Bump 2022.7.1 to 2022.12.0 * Adding edgetest upper and lower * refreshing pip-compile * small bug fix in tests --- .github/workflows/edgetest.yml | 7 ++++--- .github/workflows/test-package.yml | 1 + docs/source/conf.py | 2 +- edgetest_conda/__init__.py | 2 +- requirements.txt | 10 ++++++---- setup.cfg | 7 ++++--- tests/test_hook.py | 18 +++++++++--------- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/workflows/edgetest.yml b/.github/workflows/edgetest.yml index ffa3188..ec0ea71 100644 --- a/.github/workflows/edgetest.yml +++ b/.github/workflows/edgetest.yml @@ -4,7 +4,7 @@ name: Run edgetest on: schedule: - - cron: '35 17 * * 5' + - cron: '35 17 * * 3' jobs: edgetest: runs-on: ubuntu-latest @@ -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' \ No newline at end of file + skip-pr: 'false' + python-version: 3.9 \ No newline at end of file diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index e733dff..b81119e 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -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 }} diff --git a/docs/source/conf.py b/docs/source/conf.py index 238fbf6..292d8ca 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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 = "" diff --git a/edgetest_conda/__init__.py b/edgetest_conda/__init__.py index a7a65aa..1fb2cd4 100644 --- a/edgetest_conda/__init__.py +++ b/edgetest_conda/__init__.py @@ -1,6 +1,6 @@ """Package initialization.""" -__version__ = "2022.7.1" +__version__ = "2022.12.0" __title__ = "edgetest-conda" __description__ = "Conda edgetest plugin" diff --git a/requirements.txt b/requirements.txt index 5a2cd92..9d61fc4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # -# 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 # @@ -8,7 +8,7 @@ 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 @@ -16,7 +16,9 @@ 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: diff --git a/setup.cfg b/setup.cfg index 20aa13d..8947b6a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,13 +25,14 @@ 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 + edgetest<=2022.11.0,>=2022.3.0 [options.extras_require] docs = @@ -83,7 +84,7 @@ 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 @@ -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 diff --git a/tests/test_hook.py b/tests/test_hook.py index 5532e03..00adff1 100644 --- a/tests/test_hook.py +++ b/tests/test_hook.py @@ -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) @@ -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 @@ -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 @@ -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 @@ -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