aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElisei Roca <eroca@mailbox.org>2021-09-19 20:07:14 +0200
committerBen Sturmfels <ben@sturm.com.au>2021-09-20 12:10:04 +1000
commitb30ee2e4d2929c6d1a61c3f7a7507515d7a269ae (patch)
tree589aba7049e4431d941c04e18b3e9fc0a789cc00
parent2badff23a85a4d7d6cd05715ade342c2a7464ceb (diff)
downloadmediagoblin-b30ee2e4d2929c6d1a61c3f7a7507515d7a269ae.tar.lz
mediagoblin-b30ee2e4d2929c6d1a61c3f7a7507515d7a269ae.tar.xz
mediagoblin-b30ee2e4d2929c6d1a61c3f7a7507515d7a269ae.zip
Add db/migrations/env.py to MANIFEST.in
This fixes a warning I have with packaging where this file would get installed in the wrong place (/usr/mediagoblin/env.py). Signed-off-by: Ben Sturmfels <ben@sturm.com.au>
-rw-r--r--AUTHORS1
-rw-r--r--MANIFEST.in1
-rw-r--r--docs/source/siteadmin/relnotes.rst1
-rw-r--r--setup.cfg5
4 files changed, 3 insertions, 5 deletions
diff --git a/AUTHORS b/AUTHORS
index 1bf78364..9c014efb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,6 +44,7 @@ Thank you!
* Derek Moore
* Duncan
* Duncan Paterson
+* Elisei Roca
* Elrond of Samba TNG
* Emily O'Leary
* Fernando Gutierrez
diff --git a/MANIFEST.in b/MANIFEST.in
index dd2fd23a..afa295cb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -14,6 +14,7 @@ recursive-include mediagoblin/media_types/video/migrations *.py
include mediagoblin.example.ini mediagoblin/config_spec.ini paste.ini
include mediagoblin/config_spec.ini
include mediagoblin/db/migrations/alembic.ini
+include mediagoblin/db/migrations/env.py
graft extlib
graft licenses
graft devtools
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 59dfc945..a6e5b823 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -23,6 +23,7 @@ This chapter has important information about our current and previous releases.
=========================
- Extend left/right arrow key navigation to paginated views [#5627] (Olivier Mehani)
+- Fix incorrect setuptools install location for db/migrations/env.py (Elisei Roca)
..
**To do:**
diff --git a/setup.cfg b/setup.cfg
index e10eae0b..5bb7083b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -92,8 +92,3 @@ zc.buildout =
make_user_dev_dirs = mediagoblin.buildout_recipes:MakeUserDevDirs
babel.extractors =
jinja2 = jinja2.ext:babel_extract
-
-[options.data_files]
-# Running gmg dbupdate fails with missing env.py because env.py isn't
-# being included in the Python package (no __init__.py).
-mediagoblin = mediagoblin/db/migrations/env.py