From e182c5f63e82a69e481724a4a30521c7462c256c Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <james@purplerock.ca>
Date: Sun, 21 Jun 2020 01:25:59 -0700
Subject: [PATCH] Update and sync .dockerignore, .gitignore

Also blacklist .* and whitelist the ones we want.
---
 .dockerignore | 57 +++++++++++++++++++++++++++++++----------------
 .gitignore    | 61 +++++++++++++++++++++++----------------------------
 2 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 2ebfdc48..2879b33a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,25 +1,44 @@
+# dotfiles
+.*
+!.coveragerc
+!.dockerignore
+!.git_archival.txt
+!.gitattributes
+!.gitignore
+!.pre-commit-config.yaml
+!.readthedocs.yml
+
+# Dev scratch
 *.ipynb
-*.pdf
-*.pyc
-*.rst
-*.sublime*
 **/*.pyc
-.*/
-!.git/
-.ruffus_history.sqlite
-bin/
-build/
-docs/
-dist/
-htmlcov/
-include/
-lib/
-MANIFEST.in
-ocrmypdf.egg-info/
-staging/
-tests/cache/
-tests/output/
+/*.pdf
+/*.qdf
+/*.png
+/scratch.py
+IDEAS
+log/
 tests/resources/private/
 tmp/
 venv*/
+/debug_tests.py
+*.traineddata
+/private
+
+# Package building
+*.egg-info/
+build/
+dist/
 wheelhouse/
+pip-wheel-metadata/
+
+# Code coverage
+htmlcov/
+
+# Docker specific
+bin/
+docs/
+include/
+lib/
+
+# Docker include .git/
+!.git/
diff --git a/.gitignore b/.gitignore
index bf6e896c..90884590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,47 +1,42 @@
-# Development environment
-.bash_history
-.pylintrc
-.pytest_cache/
-.ruffus_history.sqlite
-.venv*/
-*.pyc
-*.sublime-*
-*.DS_Store
-.mypy_cache/
+# dotfiles
+.*
+!.coveragerc
+!.dockerignore
+!.git_archival.txt
+!.gitattributes
+!.gitignore
+!.pre-commit-config.yaml
+!.readthedocs.yml
+
+# Dev scratch
+*.ipynb
+**/*.pyc
+/*.pdf
+/*.qdf
+/*.png
+/scratch.py
+IDEAS
+log/
+tests/resources/private/
+tmp/
+venv*/
+/debug_tests.py
+*.traineddata
+/private
 
 # Package building
-.eggs/
 *.egg-info/
 build/
 dist/
 wheelhouse/
 pip-wheel-metadata/
 
+# Code coverage
+htmlcov/
+
 # Automatically generated files
 docs/_build/
 docs/_static/
 docs/_templates/
 docs/Makefile
 ocrmypdf/lib/_*.py
-
-# Code coverage
-.coverage*
-htmlcov/
-
-# Testing
-.ipynb_checkpoints/
-.vscode/
-*.ipynb
-*.profile
-/*.pdf
-/*.qdf
-/*.png
-/scratch.py
-IDEAS
-log/
-tests/output/
-tests/resources/private/
-tmp/
-/debug_tests.py
-*.traineddata
-/private