diff --git a/.gitignore b/.gitignore
index 151ed73fd..f45c26b23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,140 @@
-*.pyc
+_skbuild/
+
+# Byte-compiled / optimized / DLL files
 __pycache__/
-.ipynb_checkpoints
-*~
-*#
-.#*
-*.bak
-docs/_build
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
 dist/
-build
-_build
-.coverage
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
 *.egg
-.eggs
-*.egg-info
-.cache
-.idea
-.*.swp
-/.vagrant/
-.lprof
-# scikit-build
-_skbuild
 MANIFEST
-# cython output
-*.so
-wheels/
-dask-worker-space
-.tox
-log/
-py27/
-py36/
-py37/
-.package.lock
-tests/externaldata/
-*coverage.xml
-.coverage*
\ No newline at end of file
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
diff --git a/setup.py b/setup.py
index ffcefb762..d7bb0a5d0 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def prerelease_local_scheme(version):
         'imageio>=2.3.0,<2.8;python_version<"3"',
         'imageio>=2.3.0;python_version>="3"',
         'shapely[vectorized]',
-        'opencv-python',
+        'opencv-python-headless',
         'sqlalchemy',
         'matplotlib',
         'pyvips',