Include static assets in setuptools package.

2 files changed, 11 insertions, 14 deletions

diff --git a/guix-env.scm b/guix-env.scm
index a98d6d2a..95403f13 100644
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -50,18 +50,9 @@
 ;;;
 ;;;   guix environment -l guix-env.scm --container --network --share=$HOME/.bash_history
 ;;;
-;;; or (untested):
+;;; or, after applying the patch to upstream Guix:
 ;;;
-;;;   guix environment -l guix-env.scm --pure
-;;;
-;;; or (untested):
-;;;
-;;;   guix environment -l guix-env.scm
-;;;
-;;; While using --pure is a robust way to ensure that other environment
-;;; variables don't cause unexpected behaviour, it may trip up aspects of your
-;;; development tools, such as removing reference to $EDITOR. Feel free to
-;;; remove the --pure.
+;;;   ~/ws/guix/pre-inst-env guix environment --container --network --share=$HOME/.bash_history --ad-hoc mediagoblin python
 ;;;
 ;;; You'll need to run the above command every time you close your terminal or
 ;;; restart your system, so a handy way to save having to remember is to install
@@ -384,6 +375,7 @@ data as NumPy arrays.")
        ("python-sqlalchemy" ,python-sqlalchemy)
        ("python-translitcodec" ,python-translitcodec)
        ("python-unidecode" ,python-unidecode)
+       ("python-waitress" ,python-waitress)
        ("python-werkzeug" ,python-werkzeug)
        ("python-wtforms" ,python-wtforms)
 
diff --git a/setup.py b/setup.py
index 33cc8ddd..1f8d7870 100644
--- a/setup.py
+++ b/setup.py
@@ -132,9 +132,14 @@ try:
         'Programming Language :: Python :: 3.4',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
         ],
-        # Running gmg dbupdate fails with missing env.py because env.py isn't
-        # being included in the Python package (no __init__.py).
-        data_files=[('mediagoblin', ['mediagoblin/db/migrations/env.py'])],
+        data_files=[('mediagoblin', [
+            # Running gmg dbupdate fails with missing env.py because env.py isn't
+            # being included in the Python package (no __init__.py).
+            'mediagoblin/db/migrations/env.py',
+
+            # Static assets were missing in Guix package.
+            'mediagoblin/static',
+        ])],
     )
 except TypeError as e:
     import sys