TST: Remove old code

Bump Python, update matrix, fix Release

Author: pllim

.github/workflows/ci_workflows.yml

@@ -14,30 +14,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
-            python-version: 3.6
-            toxenv: py36-test-pytest46
-          - os: windows-latest
-            python-version: 3.6
-            toxenv: py36-test-pytest50
-          - os: macos-latest
-            python-version: 3.7
-            toxenv: py37-test-pytest51
           - os: ubuntu-latest
             python-version: 3.7
-            toxenv: py37-test-pytest52
+            toxenv: py37-test-pytest46
           - os: windows-latest
+            python-version: 3.7
+            toxenv: py37-test-pytest50
+          - os: macos-latest
             python-version: 3.8
-            toxenv: py38-test-pytest53
+            toxenv: py38-test-pytest52
           - os: ubuntu-latest
             python-version: 3.8
-            toxenv: py38-test-pytest60
+            toxenv: py38-test-pytest53
+          - os: windows-latest
+            python-version: 3.9
+            toxenv: py39-test-pytest60
           - os: macos-latest
             python-version: 3.9
             toxenv: py39-test-pytest61
           - os: ubuntu-latest
-            python-version: 3.9
-            toxenv: py39-test-pytestdev
+            python-version: '3.10'
+            toxenv: py310-test-pytest62
+          - os: ubuntu-latest
+            python-version: '3.10'
+            toxenv: py310-test-pytestdev
 
     steps:
     - uses: actions/checkout@v2
@@ -47,7 +47,7 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install Tox
+    - name: Install tox
       run: python -m pip install tox
-    - name: Run Tox
+    - name: Run tox
       run: tox -v -e ${{ matrix.toxenv }}

CHANGES.md

@@ -1,6 +1,8 @@
 0.4 (unreleased)
 ----------------
 
+- Minimum Python version is now 3.7. [#30]
+
 - Various infrastructure updates.
 
 0.3 (2018-12-05)

setup.cfg

@@ -26,7 +26,7 @@ long_description_content_type = text/x-rst
 [options]
 zip_safe = False
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.7
 setup_requires =
     setuptools_scm
 install_requires =

tests/test_pytest_arraydiff.py

@@ -1,13 +1,10 @@
 import os
-import sys
 import subprocess
 import tempfile
 
 import pytest
 import numpy as np
 
-PY2 = sys.version_info[0] == 2
-
 reference_dir = 'baseline'
 
 
@@ -58,11 +55,11 @@ def test_fails():
         f.write(TEST_FAILING)
 
     # If we use --arraydiff, it should detect that the file is missing
-    code = subprocess.call('py.test --arraydiff {0}'.format(test_file), shell=True)
+    code = subprocess.call('pytest --arraydiff {0}'.format(test_file), shell=True)
     assert code != 0
 
     # If we don't use --arraydiff option, the test should succeed
-    code = subprocess.call('py.test {0}'.format(test_file), shell=True)
+    code = subprocess.call('pytest {0}'.format(test_file), shell=True)
     assert code == 0
 
 
@@ -89,19 +86,13 @@ def test_generate(file_format):
 
     # If we don't generate, the test will fail
     try:
-        if PY2:
-            subprocess.check_output(['pytest', '--arraydiff', test_file])
-        else:
-            subprocess.check_output(['pytest', '--arraydiff', test_file], timeout=10)
+        subprocess.check_output(['pytest', '--arraydiff', test_file], timeout=10)
     except subprocess.CalledProcessError as grepexc:
         assert b'File not found for comparison test' in grepexc.output
 
     # If we do generate, the test should succeed and a new file will appear
-    if PY2:
-        code = subprocess.call(['pytest', '--arraydiff-generate-path={0}'.format(gen_dir), test_file])
-    else:
-        code = subprocess.call(['pytest', '--arraydiff-generate-path={0}'.format(gen_dir), test_file],
-                               timeout=10)
+    code = subprocess.call(['pytest', '--arraydiff-generate-path={0}'.format(gen_dir), test_file],
+                           timeout=10)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_gen.' + ('fits' if file_format == 'fits' else 'txt')))
 
@@ -115,6 +106,7 @@ def test_default():
     return np.arange(6 * 5).reshape((6, 5))
 """
 
+
 @pytest.mark.parametrize('file_format', ('fits', 'text'))
 def test_default_format(file_format):
 
@@ -127,15 +119,15 @@ def test_default_format(file_format):
     gen_dir = os.path.join(tmpdir, 'spam', 'egg')
 
     # If we do generate, the test should succeed and a new file will appear
-    code = subprocess.call('py.test -s --arraydiff-default-format={0}'
+    code = subprocess.call('pytest -s --arraydiff-default-format={0}'
                            ' --arraydiff-generate-path={1} {2}'.format(file_format, gen_dir, test_file), shell=True)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_default.' + ('fits' if file_format == 'fits' else 'txt')))
 
 
 @pytest.mark.array_compare(reference_dir=reference_dir, rtol=0.5, file_format='fits')
 def test_tolerance():
-    return np.ones((3,4)) * 1.6
+    return np.ones((3, 4)) * 1.6
 
 
 def test_nofile():

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,37,38,39}-test{,-devdeps}
+    py{37,38,39,310}-test{,-devdeps}
     codestyle
 requires =
     setuptools >= 30.3.0
@@ -13,11 +13,11 @@ description = run tests
 deps =
     pytest46: pytest==4.6.*
     pytest50: pytest==5.0.*
-    pytest51: pytest==5.1.*
     pytest52: pytest==5.2.*
     pytest53: pytest==5.3.*
     pytest60: pytest==6.0.*
     pytest61: pytest==6.1.*
+    pytest62: pytest==6.2.*
     pytestdev: git+https://github.com/pytest-dev/pytest#egg=pytest
 
 commands =