Merge pull request #331 from hugovk/update-config

.github/dependabot.yml

@@ -1,24 +1,29 @@
 version: 2
 updates:
-  - package-ecosystem: pip
+  - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: monthly
       time: "03:00"
     open-pull-requests-limit: 10
     labels:
       - "changelog: skip"
-      - dependencies
+      - "dependencies"
     ignore:
-      - dependency-name: respx
-        versions:
-          - 0.17.0
-  - package-ecosystem: github-actions
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-minor"
+          - "version-update:semver-patch"
+  - package-ecosystem: pip
     directory: "/"
     schedule:
       interval: monthly
       time: "03:00"
     open-pull-requests-limit: 10
     labels:
-      - dependencies
       - "changelog: skip"
+      - "dependencies"
+    ignore:
+      - dependency-name: respx
+        versions:
+          - 0.17.0

.github/labels.yml

@@ -1,4 +1,4 @@
-# Default GitHub labels.
+# Default GitHub labels
 - color: d73a4a
   description: "Something isn't working"
   name: bug
@@ -55,12 +55,18 @@
 - color: 0366d6
   description: "For dependencies and dependabot"
   name: dependencies
+- color: 0052cc
+  description: "Documentation"
+  name: docs
 - color: f4660e
   description: ""
   name: Hacktoberfest
 - color: f4660e
   description: "To credit accepted Hacktoberfest PRs"
   name: hacktoberfest-accepted
+- color: d65e88
+  description: "Deploy and release"
+  name: release
 - color: fbca04
   description: "Unit tests, linting, CI, etc."
   name: testing

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   deploy:
     if: github.repository_owner == 'hugovk'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
@@ -24,7 +24,7 @@ jobs:
         with:
           python-version: "3.10"
           cache: pip
-          cache-dependency-path: "setup.py"
+          cache-dependency-path: setup.cfg
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -12,12 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.11-dev", "3.7", "3.8", "3.9", "3.10"]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        include:
-          # Include new variables for Codecov
-          - { codecov-flag: GHA_Ubuntu, os: ubuntu-latest }
-          - { codecov-flag: GHA_macOS, os: macos-latest }
-          - { codecov-flag: GHA_Windows, os: windows-latest }
+        os: [windows-latest, macos-latest, ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v3
@@ -27,7 +22,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
-          cache-dependency-path: "setup.py"
+          cache-dependency-path: setup.cfg
 
       - name: Install dependencies
         run: |
@@ -52,7 +47,7 @@ jobs:
           tox -e pins
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3
         with:
-          flags: ${{ matrix.codecov-flag }}
+          flags: ${{ matrix.os }}
           name: ${{ matrix.os }} Python ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
@@ -28,7 +28,7 @@ repos:
       - id: python-check-blanket-noqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml
@@ -41,6 +41,11 @@ repos:
       - id: setup-cfg-fmt
         args: [--max-py-version=3.11]
 
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: 0.3.3
+    hooks:
+      - id: pyproject-fmt
+
   - repo: https://github.com/tox-dev/tox-ini-fmt
     rev: 0.5.2
     hooks:

pyproject.toml

@@ -1,6 +1,10 @@
 [build-system]
-requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
+requires = [
+  "setuptools>=45",
+  "setuptools_scm[toml]>=6.2",
+  "wheel",
+]
 
 [tool.black]
 target_version = ["py37"]

setup.cfg

@@ -29,6 +29,7 @@ keywords =
     BigQuery
 project_urls =
     Source=https://github.com/hugovk/pypistats
+    Changelog=https://github.com/hugovk/pypistats/releases
 
 [options]
 packages = find:

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 
-def local_scheme(version) -> str:
+def local_scheme(version: str) -> str:
     """Skip the local version (eg. +xyz of 0.6.1.dev4+gdf99fe2)
     to be able to upload to Test PyPI"""
     return ""

src/pypistats/__init__.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 """
 Python interface to PyPI Stats API
 https://pypistats.org/api