From 8dadad540eb35b8e8c00fd029fe6927eb8bc41e7 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 20 Dec 2022 16:28:50 -0500 Subject: [PATCH 1/3] ci: Test on Python 3.10 and 3.11 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41d2e7f..b4956a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: strategy: matrix: os: [macos-latest, windows-latest, ubuntu-latest] - python-version: [2.7, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, pypy-3.7] + python-version: [2.7, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11', pypy-2.7, pypy-3.6, pypy-3.7] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From 3feb498d7b8bd23ebd8086b79d61c734b07e2f5b Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 20 Dec 2022 16:30:07 -0500 Subject: [PATCH 2/3] ci: Drop unsupported versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4956a9..7419891 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: strategy: matrix: os: [macos-latest, windows-latest, ubuntu-latest] - python-version: [2.7, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11', pypy-2.7, pypy-3.6, pypy-3.7] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11', pypy-3.7] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From 67b1b028bfc61a8154732118ee86ec41f72fb6b5 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 20 Dec 2022 16:41:14 -0500 Subject: [PATCH 3/3] ci: Switch from nose to pytest --- .github/workflows/ci.yml | 2 +- setup.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7419891..8b0ab6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,4 +26,4 @@ jobs: - run: flake8 . - run: isort . --check-only - run: pip install .[test] - - run: nosetests + - run: pytest --cov agateexcel diff --git a/setup.py b/setup.py index c4eba10..5907729 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,8 @@ ], extras_require={ 'test': [ - 'nose>=1.1.2', + 'pytest', + 'pytest-cov', ], 'docs': [ 'Sphinx>=1.2.2',