uprev deps (#106)

samuelcolvin · web-flow · commit 1e3e9427c46f · 2022-07-26T10:35:20.000+01:00
* uprev deps

* drop 3.6, uprev, fix warnings

* fix netlify, xfail on 3.10

* fix mkdocs

* remove 3.6 comments

* linting
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     - uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.10'
 
     - run: pip install -U pip wheel
     - run: pip install -r tests/requirements-linting.txt
@@ -31,11 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
-        exclude:
-          # numpy currently get's upset with macos and python 3.10
-          - os: macos
-            python-version: '3.10.0-rc.1'
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     env:
       PYTHON: ${{ matrix.python-version }}
@@ -95,7 +91,7 @@ jobs:
       - name: set up python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'
+          python-version: '3.10'
 
       - name: install
         run: make install
diff --git a/Makefile b/Makefile
@@ -21,11 +21,11 @@ lint:
 
 .PHONY: test
 test:
-	pytest --cov=devtools --cov-fail-under 0
+	coverage run -m pytest
 
 .PHONY: testcov
 testcov:
-	pytest --cov=devtools --cov-fail-under 0
+	coverage run -m pytest
 	@echo "building coverage html"
 	@coverage html
 
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ pip install devtools[pygments]
 
 `pygments` is not required but if it's installed, output will be highlighted and easier to read.
 
-`devtools` has no other required dependencies except python 3.6, 3.7, 3.8 or 3.9.
-If you've got python 3.6+ and `pip` installed, you're good to go.
+`devtools` has no other required dependencies except python 3.7, 3.8, 3.9 or 3.10.
+If you've got python 3.7+ and `pip` installed, you're good to go.
 
 ## Usage
 
diff --git a/devtools/prettier.py b/devtools/prettier.py
@@ -74,7 +74,7 @@ def __init__(
             ((list, set, frozenset), self._format_list_like),
             (bytearray, self._format_bytearray),
             (generator_types, self._format_generator),
-            # put this last as the check can be slow
+            # put these last as the check can be slow
             (LaxMapping, self._format_dict),
             (DataClassType, self._format_dataclass),
             (SQLAlchemyClassType, self._format_sqlalchemy_class),
diff --git a/devtools/utils.py b/devtools/utils.py
@@ -133,13 +133,9 @@ class LaxMapping(metaclass=MetaLaxMapping):
 
 class MetaDataClassType(type):
     def __instancecheck__(self, instance: 'Any') -> bool:
-        try:
-            from dataclasses import _is_dataclass_instance
-        except ImportError:
-            # python 3.6
-            return False
-        else:
-            return _is_dataclass_instance(instance)
+        from dataclasses import is_dataclass
+
+        return is_dataclass(instance)
 
 
 class DataClassType(metaclass=MetaDataClassType):
diff --git a/docs/install.md b/docs/install.md
@@ -6,5 +6,5 @@ pip install devtools[pygments]
 
 `pygments` is not required but if it's installed, output will be highlighted and easier to read.
 
-`devtools` has no other required dependencies except python 3.6, 3.7, 3.8, or 3.9.
-If you've got python 3.6+ and `pip` installed, you're good to go.
+`devtools` has no other required dependencies except python 3.7, 3.8, 3.9 or 3.10.
+If you've got python 3.7+ and `pip` installed, you're good to go.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,7 +1,6 @@
-ansi2html==1.5.2
-mkdocs==1.1.2
-markdown==3.2.2
+ansi2html==1.8.0
+mkdocs==1.3.1
 mkdocs-exclude==1.0.2
-mkdocs-material==5.5.0
-markdown-include==0.5.1
-pygments==2.7.4
+mkdocs-material==8.3.9
+markdown-include==0.7.0
+pygments==2.12.0
diff --git a/docs/usage.md b/docs/usage.md
@@ -89,7 +89,7 @@ We all know the annoyance of running code only to discover a missing import, thi
 frustrating when the function you're using isn't used except during development.
 
 You can setup your environment to make `debug` available at all times by editing `sitecustomize.py`,
-with ubuntu and python3.6 this file can be found at `/usr/lib/python3.6/sitecustomize.py` but you might
+with ubuntu and python3.8 this file can be found at `/usr/lib/python3.8/sitecustomize.py` but you might
 need to look elsewhere depending on your OS/python version.
 
 Add the following to `sitecustomize.py`
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -12,9 +12,16 @@ theme:
 
 repo_name: samuelcolvin/python-devtools
 repo_url: https://github.com/samuelcolvin/python-devtools
-google_analytics:
-- 'UA-62733018-4'
-- 'auto'
+
+extra:
+  analytics:
+    provider: google
+    property: UA-62733018-4
+  social:
+  - icon: fontawesome/brands/github-alt
+    link: https://github.com/samuelcolvin/python-devtools
+  - icon: fontawesome/brands/twitter
+    link: https://twitter.com/samuel_colvin
 
 extra_css:
 - 'theme/customization.css'
diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-3.7
+3.8
diff --git a/setup.py b/setup.py
@@ -30,7 +30,6 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -49,7 +48,7 @@
     url='https://github.com/samuelcolvin/python-devtools',
     license='MIT',
     packages=['devtools'],
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=[
         'executing>=0.8.0,<1.0.0',
         'asttokens>=2.0.0,<3.0.0',
diff --git a/tests/requirements-linting.txt b/tests/requirements-linting.txt
@@ -1,6 +1,6 @@
-black==20.8b1
-flake8==3.9.2
-isort==5.9.3
-mypy==0.910
-pycodestyle==2.7.0
-pyflakes==2.3.1
+black==22.6.0
+flake8==4.0.1
+isort==5.10.1
+mypy==0.971
+pycodestyle==2.8.0
+pyflakes==2.4.0
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,12 +1,10 @@
-coverage==5.5
-Pygments==2.7.4
-pytest==6.2.5
-pytest-cov==2.12.1
-pytest-mock==3.6.1
-pytest-sugar==0.9.4
-pytest-toolbox==0.4
+coverage==6.4.2
+Pygments==2.12.0
+pytest==7.1.2
+pytest-mock==3.8.2
+pytest-sugar==0.9.5
 pydantic
 asyncpg
 numpy
 multidict
-sqlalchemy
+sqlalchemy
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -177,6 +177,7 @@ def test_kwargs_orderless():
     }
 
 
+@pytest.mark.xfail(sys.version_info >= (3, 10), reason='https://github.com/alexmojaki/executing/issues/40')
 def test_simple_vars():
     v = debug.format('test', 1, 2)
     s = normalise_output(str(v))
@@ -212,12 +213,10 @@ def test_eval():
 
 def test_warnings_disabled():
     debug_ = Debug(warnings=False)
-    with pytest.warns(None) as warnings:
-        v1 = eval('debug_.format(1)')
-        assert str(v1) == '<string>:1 <module>\n    1 (int)'
-        v2 = debug_.format(1)
-        assert 'test_warnings_disabled\n    1 (int)' in str(v2)
-    assert len(warnings) == 0
+    v1 = eval('debug_.format(1)')
+    assert str(v1) == '<string>:1 <module>\n    1 (int)'
+    v2 = debug_.format(1)
+    assert 'test_warnings_disabled\n    1 (int)' in str(v2)
 
 
 def test_eval_kwargs():
diff --git a/tests/test_prettier.py b/tests/test_prettier.py
@@ -1,6 +1,5 @@
 import os
 import string
-import sys
 from collections import Counter, OrderedDict, namedtuple
 from dataclasses import dataclass
 from typing import List
@@ -220,7 +219,6 @@ def test_counter():
 })>"""
 
 
-@pytest.mark.skipif(sys.version_info > (3, 7), reason='no datalcasses before 3.6')
 def test_dataclass():
     @dataclass
     class FooDataclass:
