Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: evansd/whitenoise
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3315f9da1f8b1d74e228afc17b3141d95e027d09
Choose a base ref
..
head repository: evansd/whitenoise
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2f66b0fac6534aede7397903ea1067b40ea2092
Choose a head ref
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -39,10 +39,10 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox tox-py
python -m pip install --upgrade 'tox>=4.0.0rc3'
- name: Run tox targets for ${{ matrix.python-version }}
run: tox --py current
run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d .)

- name: Upload coverage data
if: matrix.os != 'windows-2022'
@@ -60,7 +60,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Install dependencies
run: python -m pip install --upgrade coverage[toml]
14 changes: 6 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
*.py[co]
__pycache__
/MANIFEST
/.tox
*.egg-info/
*.pyc
/.coverage
/.coverage.*
/htmlcov
/docs/_build
/dist
/src/*.egg-info
/.tox
/build/
/dist/
/docs/_build/
22 changes: 14 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
default_language_version:
python: python3.10
python: python3.11

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
@@ -13,17 +13,23 @@ repos:
- id: check-toml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.2.0
hooks:
- id: setup-cfg-fmt
args:
- --include-version-classifiers
- repo: https://github.com/asottile/pyupgrade
rev: v3.2.0
rev: v3.3.1
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/psf/black
rev: 22.10.0
rev: 22.12.0
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
- repo: https://github.com/adamchainz/blacken-docs
rev: 1.13.0
hooks:
- id: blacken-docs
additional_dependencies:
@@ -39,7 +45,7 @@ repos:
- --add-import
- 'from __future__ import annotations'
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
rev: 6.0.0
hooks:
- id: flake8
additional_dependencies:
@@ -52,6 +58,6 @@ repos:
hooks:
- id: mypy
additional_dependencies:
- django-stubs==1.12.0
- django-stubs==1.14.0
- requests
- types-requests
3 changes: 2 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -6,10 +6,11 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.10"
python: "3.11"

sphinx:
configuration: docs/conf.py
fail_on_warning: true

formats: all

2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ WhiteNoise
.. image:: https://img.shields.io/readthedocs/whitenoise?style=for-the-badge
:target: https://whitenoise.evans.io/en/latest/

.. image:: https://img.shields.io/github/workflow/status/evansd/whitenoise/CI/master?style=for-the-badge
.. image:: https://img.shields.io/github/actions/workflow/status/evansd/whitenoise/main.yml?branch=master&style=for-the-badge
:target: https://github.com/evansd/whitenoise/actions?workflow=CI

.. image:: https://img.shields.io/badge/Coverage-96%25-success?style=for-the-badge
2 changes: 1 addition & 1 deletion docs/base.rst
Original file line number Diff line number Diff line change
@@ -206,7 +206,7 @@ sub-classing WhiteNoise and setting the attributes directly.
Note that WhiteNoise ships with its own default set of mimetypes and does
not use the system-supplied ones (e.g. ``/etc/mime.types``). This ensures
that it behaves consistently regardless of the environment in which it's
run. View the defaults in the :file:`media_types.py
run. View the defaults in the :ghfile:`media_types.py
<whitenoise/media_types.py>` file.

In addition to file extensions, mimetypes can be specified by supplying the entire
Loading