From 6c56e748a840449fee76c7c9a58930002216ec5d Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Thu, 21 Nov 2024 16:22:32 +0000 Subject: [PATCH 01/26] removed references to pytest, metadata and options from setup.cfg. added pytest to .toml --- pyproject.toml | 15 +++++++++++---- setup.cfg | 44 -------------------------------------------- 2 files changed, 11 insertions(+), 48 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 84e8bb6..d7a4509 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ [tool.black] line-length = 79 -target-version = ["py37", "py38", "py39", "py310"] +target-version = ["py38", "py39", "py310", "py311"] include = '\.pyi?$' [project] @@ -53,6 +53,16 @@ requires = ["setuptools>=45"] # Defined by PEP 517 build-backend = "setuptools.build_meta" +[tool.pytest.ini_options] +minversion = "6.0" +addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] +xfail_strict = true +filterwarnings = ["error"] +log_cli_level = "info" +testpaths = [ + "tephi", +] + [tool.repo-review] # These are a list of the currently failing tests: ignore = [ @@ -64,9 +74,6 @@ ignore = [ # TODO: exceptions that still need investigating are below. Might be fixable, or might become permanent (above): - # https://learn.scientific-python.org/development/guides/pytest/#PP301 - "PP301", # Has pytest in pyproject - # https://learn.scientific-python.org/development/guides/gha-basic/#GH212 "GH212", # Require GHA update grouping diff --git a/setup.cfg b/setup.cfg index 65cf4f9..0df43f3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,50 +19,6 @@ addopts = --doctest-modules doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS NUMBER -[metadata] -name = tephi -version = attr: tephi.__version__ -author = UK Met Office -author_email = scitools-iris-dev@googlegroups.com -url = https://github.com/SciTools/tephi -classifiers = - Development Status :: 4 - Beta - Intended Audience :: Science/Research - Operating System :: OS Independent - License :: OSI Approved :: BSD License - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Topic :: Scientific/Engineering :: Atmospheric Science - Topic :: Scientific/Engineering :: Visualization -license_files = LICENSE -description = Tephigram plotting in Python -long_description = file: README.md -long_description_content_type = text/markdown -project_urls = - code = https://github.com/SciTools/tephi - issues = https://github.com/SciTools/tephi/issues - binder = https://mybinder.org/v2/gh/SciTools/tephi/main?filepath=index.ipynb - documentation = https://tephi.readthedocs.io/en/latest/ -keywords = - tephigram - radiosonde - meteorology - visualization - -[options] -packages = find: -setup_requires = - setuptools>=40.8.0 - wheel -install_requires = - matplotlib - numpy - scipy -python_requires = >=3.8 - [options.package_data] tephi = etc/test_data/*.txt From 7471e1c5aa0570a1fcb3b797e2e950e9f5f8a43b Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Thu, 21 Nov 2024 16:32:00 +0000 Subject: [PATCH 02/26] removed setup.py --- .flake8 | 28 ---------------------------- pyproject.toml | 7 +++++++ setup.cfg | 26 -------------------------- setup.py | 11 ----------- 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 .flake8 delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 02b0915..0000000 --- a/.flake8 +++ /dev/null @@ -1,28 +0,0 @@ -[flake8] -# References: -# https://flake8.readthedocs.io/en/latest/user/configuration.html -# https://flake8.readthedocs.io/en/latest/user/error-codes.html -# https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes - -ignore = - # E203: whitespace before ':' - E203, - # E226: missing whitespace around arithmetic operator - E226, - # E231: missing whitespace after ',', ';', or ':' - E231, - # E402: module level imports on one line - E402, - # E501: line too long - E501, - # W503: line break before binary operator - W503, - # W504: line break after binary operator - W504, -exclude = - # - # ignore the following directories - # - .eggs, - build, - sphinxext, diff --git a/pyproject.toml b/pyproject.toml index d7a4509..fbbc026 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,6 +53,13 @@ requires = ["setuptools>=45"] # Defined by PEP 517 build-backend = "setuptools.build_meta" +[tool.setuptools.package-data] +mypkg = [ + "etc/test_data/*.txt", + "tests/results/*.npz", + "tests/results/imagerepo.json" +] + [tool.pytest.ini_options] minversion = "6.0" addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 0df43f3..0000000 --- a/setup.cfg +++ /dev/null @@ -1,26 +0,0 @@ -[flake8] -exclude = - .git, - docs, - tephi/tests/__init__.py - .eggs - -[tool:pytest] -testpaths = - tephi/ -markers = - graphical: mark a test as a graphical test -addopts = - -ra - -v - --cov-config=.coveragerc - --cov=tephi - --cov-report=term-missing - --doctest-modules -doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS NUMBER - -[options.package_data] -tephi = - etc/test_data/*.txt - tests/results/*.npz - tests/results/imagerepo.json diff --git a/setup.py b/setup.py deleted file mode 100644 index 093148b..0000000 --- a/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python -"""A file to be used for installing or building the package.""" -# Copyright Tephi contributors -# -# This file is part of Tephi and is released under the BSD license. -# See LICENSE in the root of the repository for full licensing details. - -from setuptools import setup - -if __name__ == "__main__": - setup() From 439e182a3e945af6cc17cc903f2152ee4b6f0cde Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Tue, 26 Nov 2024 12:04:33 +0000 Subject: [PATCH 03/26] added isolated buid to tox --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 7f7b389..b1c8016 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ requires = minversion = 3.15 base_python = py311 envlist=py{38,39,310,311} +isolated_build = True [testenv] description = invoke pytest to run automated tests From a3c551f31713d35daa6cd10d45c768d5c82d66f3 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Tue, 26 Nov 2024 12:12:26 +0000 Subject: [PATCH 04/26] added dynamic readme to pyproj.toml --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index fbbc026..fd82cdf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,6 +60,9 @@ mypkg = [ "tests/results/imagerepo.json" ] +[tool.setuptools.dynamic] +readme = {file = ["README.md"]} + [tool.pytest.ini_options] minversion = "6.0" addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] From 9edbeb02e958b32a5259a820f20547fdeff6444c Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Tue, 26 Nov 2024 12:20:47 +0000 Subject: [PATCH 05/26] removed flake8 from manifest --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 9cfe63a..fe0bbd5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,7 +5,6 @@ include *.yaml include *.yml include *.cff include .coveragerc -include .flake8 include .git-blame-ignore-revs include tox.ini recursive-include requirements *.yml From c636c4c2bb07b89efd5d38d9a987117d04793dcb Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Tue, 26 Nov 2024 12:26:49 +0000 Subject: [PATCH 06/26] updated manifest --- MANIFEST.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index fe0bbd5..7ab0267 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -14,3 +14,7 @@ recursive-include docs *.png recursive-include docs *.py recursive-include docs *.rst recursive-include docs Makefile +recursive-include tephi *.json +recursive-include tephi *.npz +recursive-include tephi *.txt + From eecd6e4914af9a84271cd95b3ea565af14a8f62b Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Tue, 26 Nov 2024 12:32:30 +0000 Subject: [PATCH 07/26] fixed issue url --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fd82cdf..f82161f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ requires-python = ">=3.8" [project.urls] Code = "https://github.com/SciTools/tephi" -Issues = "issues = https://github.com/SciTools/tephi/issues" +Issues = "https://github.com/SciTools/tephi/issues" Binder= "https://mybinder.org/v2/gh/SciTools/tephi/main?filepath=index.ipynb" Docs = "https://tephi.readthedocs.io/en/latest/" From f96eac762edbb2b468ed8c86f09b8f3293fa0ff2 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Tue, 26 Nov 2024 14:26:52 +0000 Subject: [PATCH 08/26] added setup.py --- setup.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..fb223c1 --- /dev/null +++ b/setup.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +"""A file to be used for installing or building the package.""" +# Copyright Tephi contributors +# +# This file is part of Tephi and is released under the BSD license. +# See LICENSE in the root of the repository for full licensing details. + +from setuptools import setup + +if __name__ == "__main__": + setup() \ No newline at end of file From 1b1b16758e2972803dc44a11b9befc484211262c Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 12:28:53 +0000 Subject: [PATCH 09/26] added pytest spec --- pyproject.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index f82161f..d8ca367 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,6 +94,15 @@ ignore = [ "PC901", # Custom pre-commit CI message ] +[tool.pytest.ini_options] +minversion = "6.0" +addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] +xfail_strict = true +filterwarnings = ["error"] +log_cli_level = "info" +testpaths = [ + "tephi", +] [tool.mypy] strict = false From e17faae5a2af47fb9ed2275747e5c2e224c02980 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 12:31:04 +0000 Subject: [PATCH 10/26] removed dupe pytest spec --- pyproject.toml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d8ca367..acdd245 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,16 +94,6 @@ ignore = [ "PC901", # Custom pre-commit CI message ] -[tool.pytest.ini_options] -minversion = "6.0" -addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] -xfail_strict = true -filterwarnings = ["error"] -log_cli_level = "info" -testpaths = [ - "tephi", -] - [tool.mypy] strict = false ignore_missing_imports = true From e76c147c3ea80717915c3134ace628dacd39a451 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 12:58:45 +0000 Subject: [PATCH 11/26] cleaned up pyrpoj, removed setup.py --- pyproject.toml | 10 ++++++---- setup.py | 11 ----------- 2 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml index acdd245..4d4985e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,9 +27,7 @@ classifiers = [ description = "Tephigram plotting in Python" dynamic = [ "dependencies", - "optional-dependencies", "readme", - "version", ] keywords = [ "tephigram", @@ -54,14 +52,18 @@ requires = ["setuptools>=45"] build-backend = "setuptools.build_meta" [tool.setuptools.package-data] -mypkg = [ +tephi = [ "etc/test_data/*.txt", "tests/results/*.npz", "tests/results/imagerepo.json" ] [tool.setuptools.dynamic] -readme = {file = ["README.md"]} +dependencies = { file = ["requirements/dev.yml"] } +readme = {file = ["README.md"], content-type = "text/markdown"} + +[tool.setuptools.packages.find] +include = ["tephi*"] [tool.pytest.ini_options] minversion = "6.0" diff --git a/setup.py b/setup.py deleted file mode 100644 index fb223c1..0000000 --- a/setup.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python -"""A file to be used for installing or building the package.""" -# Copyright Tephi contributors -# -# This file is part of Tephi and is released under the BSD license. -# See LICENSE in the root of the repository for full licensing details. - -from setuptools import setup - -if __name__ == "__main__": - setup() \ No newline at end of file From ecfced8331040eec511b3107aa91df644e4df5d5 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 13:04:38 +0000 Subject: [PATCH 12/26] added version --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 4d4985e..fd3a30b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,6 +26,7 @@ classifiers = [ ] description = "Tephigram plotting in Python" dynamic = [ + "version", "dependencies", "readme", ] @@ -60,6 +61,7 @@ tephi = [ [tool.setuptools.dynamic] dependencies = { file = ["requirements/dev.yml"] } +version = { attr = "tephi.__version__"} readme = {file = ["README.md"], content-type = "text/markdown"} [tool.setuptools.packages.find] From 7c4200378507035b09ead9c7b41724eb7429be10 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 13:07:48 +0000 Subject: [PATCH 13/26] move build-system --- pyproject.toml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fd3a30b..81ef194 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,10 @@ # See https://github.com/SciTools/.github/wiki/Linting # for SciTools linting guidelines +[build-system] +# Defined by PEP 518 +requires = ["setuptools>=45"] +# Defined by PEP 517 +build-backend = "setuptools.build_meta" [tool.black] line-length = 79 @@ -46,12 +51,6 @@ Issues = "https://github.com/SciTools/tephi/issues" Binder= "https://mybinder.org/v2/gh/SciTools/tephi/main?filepath=index.ipynb" Docs = "https://tephi.readthedocs.io/en/latest/" -[build-system] -# Defined by PEP 518 -requires = ["setuptools>=45"] -# Defined by PEP 517 -build-backend = "setuptools.build_meta" - [tool.setuptools.package-data] tephi = [ "etc/test_data/*.txt", From 039e3c465a5c9551adf198bb44ea7a39a7c5c63a Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 13:15:10 +0000 Subject: [PATCH 14/26] static deps --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 81ef194..2ffac47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,6 @@ classifiers = [ description = "Tephigram plotting in Python" dynamic = [ "version", - "dependencies", "readme", ] keywords = [ @@ -44,6 +43,7 @@ keywords = [ license = {text = "BSD-3-Clause"} name = "tephi" requires-python = ">=3.8" +dependencies = ["matplotlib", "numpy", "scipy"] [project.urls] Code = "https://github.com/SciTools/tephi" @@ -59,7 +59,6 @@ tephi = [ ] [tool.setuptools.dynamic] -dependencies = { file = ["requirements/dev.yml"] } version = { attr = "tephi.__version__"} readme = {file = ["README.md"], content-type = "text/markdown"} From 336427cff979ee12afcd7604b54d6da0af99b0b3 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Fri, 29 Nov 2024 13:36:33 +0000 Subject: [PATCH 15/26] removed tox isolated --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index b1c8016..7f7b389 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ requires = minversion = 3.15 base_python = py311 envlist=py{38,39,310,311} -isolated_build = True [testenv] description = invoke pytest to run automated tests From 95296d0faf6f74b4217968386d2e82aa52fe2b15 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 10:38:39 +0000 Subject: [PATCH 16/26] fixed test directory, readded isolated build --- pyproject.toml | 2 +- tox.ini | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2ffac47..08a0b59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ xfail_strict = true filterwarnings = ["error"] log_cli_level = "info" testpaths = [ - "tephi", + "tephi/tests", ] [tool.repo-review] diff --git a/tox.ini b/tox.ini index 7f7b389..b409156 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,8 @@ requires = tox-conda minversion = 3.15 base_python = py311 -envlist=py{38,39,310,311} +envlist = py{38,39,310,311} +isolated_build = True [testenv] description = invoke pytest to run automated tests @@ -28,5 +29,5 @@ commands = sphinx-apidoc -o "{env:DOCSDIR}/api" tephi tephi/tests sphinx-build -W --keep-going -b html -d "{env:BUILDDIR}/doctrees" "{env:DOCSDIR}" "{env:BUILDDIR}/html" {posargs} # when running the doctests, also check that any snippets in the - # docs are representative of the module output + # docs are representative Sof the module output doctests: sphinx-build -b doctest -d "{env:BUILDDIR}/doctrees" "{env:DOCSDIR}" "{env:BUILDDIR}/doctest" {posargs} From 3a25759bbac40bc443eef6087078ada76b34c653 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 10:42:54 +0000 Subject: [PATCH 17/26] removed min_version --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index b409156..4f26d8e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,6 @@ [tox] requires = tox-conda -minversion = 3.15 base_python = py311 envlist = py{38,39,310,311} isolated_build = True From 9fc6a4cdfeba96eb91f219a86350a959cd730895 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 10:55:01 +0000 Subject: [PATCH 18/26] trying something --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 4f26d8e..837a853 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] requires = tox-conda -base_python = py311 +base_python = py310 envlist = py{38,39,310,311} isolated_build = True -[testenv] +[testenv:.package] description = invoke pytest to run automated tests deps = pytest From 47c080f3feb07522e71d11112395163888d5deef Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 14:29:35 +0000 Subject: [PATCH 19/26] removed filterwarnings --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 08a0b59..2ba6db6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,7 +69,7 @@ include = ["tephi*"] minversion = "6.0" addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] xfail_strict = true -filterwarnings = ["error"] +#filterwarnings = ["error"] log_cli_level = "info" testpaths = [ "tephi/tests", From 4c92675cca93db730fd3d8bdbbb19485f87a698f Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 14:54:37 +0000 Subject: [PATCH 20/26] fiddled with stuff --- .github/workflows/ci-tests.yml | 4 +++- tox.ini | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index aa0b4b6..4efe73e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -27,4 +27,6 @@ jobs: .tox - name: Run tox - run: pipx run 'tox<4' + run: | + pip install 'tox<4' + tox -e py311-test diff --git a/tox.ini b/tox.ini index 837a853..48f44d1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,8 @@ [tox] requires = tox-conda -base_python = py310 -envlist = py{38,39,310,311} -isolated_build = True -[testenv:.package] +[testenv: py{38,39,310,311}-test] description = invoke pytest to run automated tests deps = pytest From 97efba06ef4963ca3d5349be15abf70539596b5e Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 14:57:36 +0000 Subject: [PATCH 21/26] fiddled with stuff --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 48f44d1..c665f35 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ requires = tox-conda -[testenv: py{38,39,310,311}-test] +[testenv:py{38,39,310,311}-test] description = invoke pytest to run automated tests deps = pytest From 6218542b97e883be3647dbee69356b3625b604ca Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 14:59:48 +0000 Subject: [PATCH 22/26] fiddled with stuff --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index c665f35..1181bb2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] requires = tox-conda + tox-run-command [testenv:py{38,39,310,311}-test] description = invoke pytest to run automated tests From 83562fb029a26c3dad0a02b6078f24543413a9ca Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 15:03:50 +0000 Subject: [PATCH 23/26] isobuild --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1181bb2..a74c467 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] requires = tox-conda - tox-run-command +isolated_build=True [testenv:py{38,39,310,311}-test] description = invoke pytest to run automated tests From b4b30732c6cdc4afc57051f2f5ecb07c8d934550 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 15:08:09 +0000 Subject: [PATCH 24/26] pipx --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4efe73e..85e0874 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -28,5 +28,5 @@ jobs: - name: Run tox run: | - pip install 'tox<4' + pipx install 'tox<4' tox -e py311-test From 89b40e55dd18872c0073d436c1e20c3866a45942 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 15:10:44 +0000 Subject: [PATCH 25/26] pipx run --- .github/workflows/ci-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 85e0874..42dd985 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -28,5 +28,5 @@ jobs: - name: Run tox run: | - pipx install 'tox<4' - tox -e py311-test + pipx run 'tox<4' +# tox -e py311-test From 7b06c99ad9d1987caea0c0c2942a44cd1c668159 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 2 Dec 2024 15:11:04 +0000 Subject: [PATCH 26/26] pipx run --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 42dd985..a295947 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -29,4 +29,4 @@ jobs: - name: Run tox run: | pipx run 'tox<4' -# tox -e py311-test + tox -e py311-test