Merge pull request #454 from hugovk/update-test-config

.github/release-drafter.yml

@@ -1,5 +1,5 @@
-name-template: "$NEXT_PATCH_VERSION"
-tag-template: "$NEXT_PATCH_VERSION"
+name-template: "$RESOLVED_VERSION"
+tag-template: "$RESOLVED_VERSION"
 
 categories:
   - title: "Added"
@@ -23,6 +23,21 @@ exclude-labels:
   - "changelog: skip"
 
 template: |
-  ## Changes
-
   $CHANGES
+
+version-resolver:
+  major:
+    labels:
+      - "changelog: Removed"
+  minor:
+    labels:
+      - "changelog: Added"
+      - "changelog: Changed"
+      - "changelog: Deprecated"
+      - "enhancement"
+
+  patch:
+    labels:
+      - "changelog: Fixed"
+      - "bug"
+  default: minor

.github/workflows/deploy.yml

@@ -11,17 +11,17 @@ on:
 jobs:
   build:
     if: github.repository == 'ultrajson/ultrajson'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
       - run: |
             git fetch --prune --unshallow
 
-      - name: Set up Python 3.8
+      - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Install dependencies
         run: |

.github/workflows/labels.yml

@@ -11,5 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: micnncim/action-label-syncer@v1
+        with:
+          prune: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -2,39 +2,11 @@ name: Lint
 
 on: [push, pull_request]
 
-env:
-  FORCE_COLOR: 1
-
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/pip
-            ~/.cache/pre-commit
-          key:
-            lint-${{ hashFiles('**/setup.py') }}-${{
-            hashFiles('**/.pre-commit-config.yaml') }}
-          restore-keys: |
-            lint-
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip
-          python -m pip install -U pre-commit
-
-      - name: Lint
-        run: pre-commit run --all-files
-        env:
-          PRE_COMMIT_COLOR: always
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/action@v2.0.0

.github/workflows/test.yml

@@ -15,21 +15,12 @@ jobs:
           - { python-version: "pypy3", os: ubuntu-18.04 }
           - { python-version: "pypy3", os: ubuntu-16.04 }
           # Dev versions
-          # 3.10-dev blocked by:
-          # AssertionError: would build wheel with unsupported tag ('cp310', 'cp310', 'linux_x86_64')
-          #- { python-version: "3.10-dev", os: ubuntu-18.04 }
+          - { python-version: "3.10-dev", os: ubuntu-20.04 }
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python ${{ matrix.python }} (deadsnakes)
-        uses: deadsnakes/action@v1.0.0
-        if: endsWith(matrix.python-version, '-dev')
-        with:
-          python-version: ${{ matrix.python-version }}
-
       - name: Set up Python ${{ matrix.python-version }}
-        if: "!endsWith(matrix.python-version, '-dev')"
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
@@ -56,6 +47,5 @@ jobs:
           python -m pip install .
 
       - name: Tests
-        shell: bash
         run: |
           pytest

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.2
+    rev: v2.10.0
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]
@@ -12,27 +12,27 @@ repos:
         args: ["--target-version", "py36"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.5.1
+    rev: 5.7.0
     hooks:
       - id: isort
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.3
+    rev: 3.8.4
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
 
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.6.0
+    rev: v1.8.0
     hooks:
       - id: python-check-blanket-noqa
       - id: rst-backticks
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
-      - id: check-merge-conflict
       - id: check-json
+      - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
       - id: end-of-file-fixer

README.rst

@@ -36,7 +36,7 @@ Install with pip:
 
 .. code-block:: sh
 
-    $ python -m pip install ujson
+    python -m pip install ujson
 
 ============
 Usage