heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include static assets in setuptools package.

Browse Source
This commit is contained in:
Ben Sturmfels 2021-04-07 23:25:54 +10:00
parent c290900f17
commit 1b747cb526
No known key found for this signature in database
GPG Key ID: 023C05E2C9C068F0
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guix-env.scm
View File

@ -50,18 +50,9 @@
;;; ;;;
;;; guix environment -l guix-env.scm --container --network --share=$HOME/.bash_history ;;; 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 ;;; ~/ws/guix/pre-inst-env guix environment --container --network --share=$HOME/.bash_history --ad-hoc mediagoblin python
;;;
;;; 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.
;;; ;;;
;;; You'll need to run the above command every time you close your terminal or ;;; 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 ;;; 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-sqlalchemy" ,python-sqlalchemy)
("python-translitcodec" ,python-translitcodec) ("python-translitcodec" ,python-translitcodec)
("python-unidecode" ,python-unidecode) ("python-unidecode" ,python-unidecode)
("python-waitress" ,python-waitress)
("python-werkzeug" ,python-werkzeug) ("python-werkzeug" ,python-werkzeug)
("python-wtforms" ,python-wtforms) ("python-wtforms" ,python-wtforms)

7
setup.py
View File

@ -132,9 +132,14 @@ try:
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
"Topic :: Internet :: WWW/HTTP :: Dynamic Content" "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
], ],
data_files=[('mediagoblin', [
# Running gmg dbupdate fails with missing env.py because env.py isn't # Running gmg dbupdate fails with missing env.py because env.py isn't
# being included in the Python package (no __init__.py). # being included in the Python package (no __init__.py).
data_files=[('mediagoblin', ['mediagoblin/db/migrations/env.py'])], 'mediagoblin/db/migrations/env.py',
# Static assets were missing in Guix package.
'mediagoblin/static',
])],
) )
except TypeError as e: except TypeError as e:
import sys import sys