From 92aeab415ae2b73d2776ad2b1c4e8fa3a5e0d51e Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Mon, 21 Dec 2020 08:10:04 -0800
Subject: Fix tox "manifest" environment to pass (#566)

* Fix tox "manifest" environment to pass

The command `tox -e manifest` now passes.

Added missing files to the sdist:

- .pre-commit-config.yaml
- CODE_OF_CONDUCT.md
- jwt/py.typed
- docs/

Alphabetized MANIFEST.in

Moved .flake8 to setup.cfg to avoid the need to include yet another file
to MANIFEST.in.

Exclude codecov.yml. This is for CI only.

* Move check-manifest to a pre-commit hook
---
 .flake8                 |  3 ---
 .pre-commit-config.yaml |  6 ++++++
 MANIFEST.in             | 12 +++++++++---
 setup.cfg               |  4 ++++
 tox.ini                 | 10 +---------
 5 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 .flake8

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index f81cf2c..0000000
--- a/.flake8
+++ /dev/null
@@ -1,3 +0,0 @@
-[flake8]
-max-line-length = 79
-extend-ignore = E203, E501
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 96c6a1c..6d179c9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,3 +28,9 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: debug-statements
+
+  - repo: https://github.com/mgedmin/check-manifest
+    rev: "0.45"
+    hooks:
+      - id: check-manifest
+        args: [--no-build-isolation]
diff --git a/MANIFEST.in b/MANIFEST.in
index 49065e3..01dde5d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,14 @@
-include README.rst
+include .pre-commit-config.yaml
+include CODE_OF_CONDUCT.md
+include AUTHORS.rst
 include CHANGELOG.md
 include LICENSE
-include AUTHORS.rst
+include README.rst
 include tox.ini
+include jwt/py.typed
+graft docs
 graft tests
-recursive-exclude * __pycache__
+exclude codecov.yml
+recursive-exclude docs/_build *
 recursive-exclude * *.py[co]
+recursive-exclude * __pycache__
diff --git a/setup.cfg b/setup.cfg
index 2fcfe65..6792f7c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,6 +63,10 @@ exclude =
     tests
     tests.*
 
+[flake8]
+max-line-length = 79
+extend-ignore = E203, E501
+
 [mypy]
 python_version = 3.6
 ignore_missing_imports = true
diff --git a/tox.ini b/tox.ini
index f29ede7..946a2a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ filterwarnings =
 python =
     3.6: py36
     3.7: py37, docs
-    3.8: py38, lint, manifest, typing
+    3.8: py38, lint, typing
     3.9: py39
 
 
@@ -26,7 +26,6 @@ envlist =
     typing
     py{36,37,38,39}-crypto-{linux,windows}
     py{36,37,38,39}-nocrypto-{linux,windows}
-    manifest
     docs
     pypi-description
     coverage-report
@@ -66,13 +65,6 @@ passenv = HOMEPATH  # needed on Windows
 commands = pre-commit run --all-files
 
 
-[testenv:manifest]
-basepython = python3.8
-deps = check-manifest
-skip_install = true
-commands = check-manifest
-
-
 [testenv:pypi-description]
 basepython = python3.8
 skip_install = true
-- 
cgit v1.2.1