From 9a137032aea3c68f1992c2c8ecf8c3ccbc44c6b1 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Thu, 25 Nov 2021 18:39:40 +0200
Subject: [PATCH] Test config updates

---
 .github/workflows/labels.yml          |  3 ++-
 .github/workflows/release-drafter.yml |  3 ++-
 .pre-commit-config.yaml               | 15 ++++++++++-----
 README.md                             |  4 ++--
 setup.cfg                             |  2 +-
 src/pypistats/__init__.py             |  2 +-
 tox.ini                               | 23 +++++++++++++----------
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index caa005ce..c22c0d06 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -1,4 +1,5 @@
 name: Sync labels
+
 on:
   push:
     branches:
@@ -8,7 +9,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  sync:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 02a7bada..a806a436 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -5,10 +5,11 @@ on:
     # branches to consider in the event; optional, defaults to all
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   update_release_draft:
-    if: github.repository == 'hugovk/pypistats'
+    if: github.repository_owner == 'hugovk'
     runs-on: ubuntu-latest
     steps:
       # Drafts your next release notes as pull requests are merged into "main"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3db74bf2..ccf9818a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,23 +1,23 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.0
+    rev: v2.29.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
 
   - repo: https://github.com/psf/black
-    rev: 21.9b0
+    rev: 21.11b1
     hooks:
       - id: black
         args: [--target-version=py37]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.9.3
+    rev: 5.10.1
     hooks:
       - id: isort
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 4.0.1
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
@@ -36,10 +36,15 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.18.0
+    rev: v1.20.0
     hooks:
       - id: setup-cfg-fmt
 
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: 0.5.1
+    hooks:
+      - id: tox-ini-fmt
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.4.1
     hooks:
diff --git a/README.md b/README.md
index b83f8f1e..95b38e7f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ key and get free quota.)
 ### From PyPI
 
 ```bash
-pip install --upgrade pypistats
+python3 -m pip install --upgrade pypistats
 ```
 
 ### From source
@@ -31,7 +31,7 @@ pip install --upgrade pypistats
 ```bash
 git clone https://github.com/hugovk/pypistats
 cd pypistats
-pip install .
+python3 -m pip install .
 ```
 
 ## Example command-line use
diff --git a/setup.cfg b/setup.cfg
index ea076813..5cdef36d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,7 +43,7 @@ install_requires =
 python_requires = >=3.7
 package_dir = =src
 setup_requires =
-    setuptools_scm
+    setuptools-scm
 zip_safe = True
 
 [options.packages.find]
diff --git a/src/pypistats/__init__.py b/src/pypistats/__init__.py
index 03f82ad4..bf623f1a 100644
--- a/src/pypistats/__init__.py
+++ b/src/pypistats/__init__.py
@@ -21,7 +21,7 @@
     # Python 3.8+
     import importlib.metadata as importlib_metadata
 except ImportError:
-    # <Python 3.7 and lower
+    # Python 3.7 and lower
     import importlib_metadata
 
 __version__ = importlib_metadata.version(__name__)
diff --git a/tox.ini b/tox.ini
index 27a349d7..6c354caa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 envlist =
     cog
     lint
-    py{37, 38, 39, 310}
     pins
+    py{310, 39, 38, 37}
 
 [testenv]
 extras =
@@ -11,26 +11,29 @@ extras =
     pandas
     tests
 commands =
-    # Unit tests
     {envpython} -m pytest --cov pypistats --cov tests --cov-report xml {posargs}
-
-    # Test runs
     pypistats --version
     pypistats --help
     pypistats recent --help
 
 [testenv:cog]
-deps = cogapp
-commands = cog -Pr README.md
 skip_install = true
+deps =
+    cogapp
+commands =
+    cog -Pr README.md
 
 [testenv:lint]
-deps = pre-commit
-commands = pre-commit run --all-files
+passenv =
+    PRE_COMMIT_COLOR
 skip_install = true
-passenv = PRE_COMMIT_COLOR
+deps =
+    pre-commit
+commands =
+    pre-commit run --all-files --show-diff-on-failure
 
 [testenv:pins]
-extras = None
+extras =
+    None
 commands_pre =
     {envpython} -m pip install -r requirements.txt