From 35b478b2991d3d1106a1a6c40efa4958498d6ce6 Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Mon, 17 Jan 2022 14:27:02 +0100 Subject: [PATCH 1/2] Remove support for Python 3.7 --- .github/workflows/test.yml | 4 +++- README.md | 2 +- setup.py | 3 +-- tox.ini | 5 ++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c536b1..e775e9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: + - "3.8" + - "3.9" steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 94a591b..1a2996e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Plugins for camacq: ### Requirements -- Python version 3.7+. +- Python version 3.8+. - camacq >= 0.6.0 ## Usage diff --git a/setup.py b/setup.py index 0a4ecd5..b2ffb28 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ long_description=LONG_DESCRIPTION, long_description_content_type="text/markdown", packages=setuptools.find_packages(), - python_requires=">=3.7", + python_requires=">=3.8", install_requires=REQUIRES, entry_points={ "camacq.plugins": [ @@ -35,7 +35,6 @@ "Development Status :: 2 - Pre-Alpha", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", ], diff --git a/tox.ini b/tox.ini index 44ffcd2..9c8c887 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,10 @@ [tox] -envlist = py37, py38, py39, lint +envlist = py38, py39, lint skip_missing_interpreters = True [gh-actions] python = - 3.7: py37, lint - 3.8: py38 + 3.8: py38, lint 3.9: py39 [testenv] From 87c5bdb42c9bda313d31ded94a53deb852dd09fe Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Mon, 17 Jan 2022 14:32:34 +0100 Subject: [PATCH 2/2] Remove asynctest --- requirements_test.txt | 1 - tests/production/test_production.py | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements_test.txt b/requirements_test.txt index 5a74369..ba5de00 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,4 +1,3 @@ -asynctest==0.13.0 pytest==6.2.5 pytest-asyncio==0.17.1 pytest-cov==3.0.0 diff --git a/tests/production/test_production.py b/tests/production/test_production.py index 69ccd3d..a8c41f0 100644 --- a/tests/production/test_production.py +++ b/tests/production/test_production.py @@ -1,9 +1,8 @@ """Test the production plugin.""" -from unittest.mock import call +from unittest.mock import AsyncMock, call import pytest import voluptuous as vol -from asynctest import CoroutineMock from ruamel.yaml import YAML from camacq import plugins @@ -78,7 +77,7 @@ async def test_image_events(center, leica_sample): well_x = 0 well_y = 0 await plugins.setup_module(center, config) - calc_gain = CoroutineMock() + calc_gain = AsyncMock() gains = { "green": 800, "blue": 700,