From 14873e1565f72fdf479d0323e9eeec41eafaad49 Mon Sep 17 00:00:00 2001 From: Daniel Himmelstein Date: Mon, 28 Mar 2022 15:27:14 -0400 Subject: [PATCH] upgrade python requires >= 3.8 import importlib.metadata doesn't work with the importlib_metadata backport. --- .github/workflows/build.yaml | 6 +++--- .pre-commit-config.yaml | 8 ++++---- pyproject.toml | 3 +-- setup.cfg | 3 +-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 413b8f2..b011dd4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,12 +12,12 @@ jobs: - windows-latest - macOS-latest python-version: - - "3.7" + - "3.8" - "3.10" steps: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Setup Graphviz @@ -32,6 +32,6 @@ jobs: if: matrix.os != 'windows-latest' run: pip install ".[viz]" - name: Run pre-commit - uses: pre-commit/action@v2.0.0 + uses: pre-commit/action@v2.0.3 - name: Test with pytest run: pytest --color=yes diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 882ae2e..250ebdc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,16 +10,16 @@ repos: - id: check-case-conflict - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v2.31.0 + rev: v2.31.1 hooks: - id: pyupgrade - args: [--py37-plus] + args: [--py38-plus] - repo: https://github.com/timothycrosley/isort rev: 5.10.1 hooks: - id: isort - repo: https://github.com/python/black - rev: 22.1.0 + rev: 22.3.0 hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 @@ -27,7 +27,7 @@ repos: hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.931 + rev: v0.942 hooks: - id: mypy args: ["--strict", "--show-error-codes"] diff --git a/pyproject.toml b/pyproject.toml index 98ce467..1e9ee6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ use_parentheses = true line_length = 88 [tool.black] -target-version = ['py37', 'py38', 'py39', 'py310'] +target-version = ['py38', 'py39', 'py310'] # https://mypy.readthedocs.io/en/stable/config_file.html#using-a-pyproject-toml-file [tool.mypy] @@ -36,7 +36,6 @@ module = [ "setuptools.*", "pandas.*", "pytest.*", - "_pytest.*", "pygraphviz.*", ] ignore_missing_imports = true diff --git a/setup.cfg b/setup.cfg index fa7278b..50901d9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,10 +27,9 @@ keywords = packages = nxontology zip_safe = False include_package_data = True -python_requires = >=3.7 +python_requires = >=3.8 install_requires = fsspec[http] - importlib_metadata; python_version < '3.8' networkx>=2 pronto>=2.4.0