Simplifying MANIFEST.in

99 views
Skip to first unread message

Tim Graham

unread,
Jul 22, 2015, 12:40:08 PM7/22/15
to Django developers (Contributions to Django itself)
Lately we've had some packaging problems due to mistakes in MANIFEST.in, mostly due to missing files in the source distribution because we forgot to update MANIFEST.in for new or moved files. Currently it looks like this:

include README.rst
include AUTHORS
include INSTALL
include LICENSE
include MANIFEST.in
include django/contrib/auth/common-passwords.txt.gz
include django/contrib/gis/gdal/LICENSE
include django/contrib/gis/geos/LICENSE
include django/dispatch/license.txt
include django/dispatch/license.python.txt
recursive-include docs *
recursive-include scripts *
recursive-include extras *
recursive-include tests *
recursive-include django/conf/app_template *
recursive-include django/conf/locale *
recursive-include django/conf/project_template *
recursive-include django/contrib/*/locale *
recursive-include django/contrib/admin/templates *
recursive-include django/contrib/admin/static *
recursive-include django/contrib/admindocs/templates *
recursive-include django/contrib/auth/templates *
recursive-include django/contrib/gis/static *
recursive-include django/contrib/gis/templates *
recursive-include django/contrib/sitemaps/templates *
recursive-exclude * __pycache__
recursive-exclude * *.py[co]

Despite all the rules for django/, it seems the only difference in there is that django/contrib/admin/bin isn't included in the distribution. Is there a reason not to do something like:

recursive-include django *
prune django/contrib/admin/bin

This seems to generate the same result except that the missing django/contrib/auth/common-passwords.txt.gz (forgot to add) is correctly included.

On a related note, should the new JavaScript tests also be included in the distribution?

Russell Keith-Magee

unread,
Jul 22, 2015, 8:31:13 PM7/22/15
to Django Developers
I can't think of any reason your new rule wouldn't be an improvement.

On a related note, should the new JavaScript tests also be included in the distribution?

Side note - if you don't know about it, check-manifest is a helpful tool for validating if your MANIFEST.in is complete and correct:


Russ %-)

Markus Holtermann

unread,
Jul 22, 2015, 9:44:10 PM7/22/15
to django-d...@googlegroups.com
If we ship the Python tests we should also ship the JS tests, IMO.

/Markus
>
>--
>You received this message because you are subscribed to the Google Groups "Django developers (Contributions to Django itself)" group.
>To unsubscribe from this group and stop receiving emails from it, send an email to django-develop...@googlegroups.com.
>To post to this group, send email to django-d...@googlegroups.com.
>Visit this group at http://groups.google.com/group/django-developers.
>To view this discussion on the web visit https://groups.google.com/d/msgid/django-developers/2996a59b-09ab-4dc2-bba5-cc5c868f81f1%40googlegroups.com.
>For more options, visit https://groups.google.com/d/optout.


--

Tim Graham

unread,
Jul 24, 2015, 7:34:56 AM7/24/15
to Django developers (Contributions to Django itself), in...@markusholtermann.eu
Pull request is https://github.com/django/django/pull/5039 if someone could double check it. Thanks for the feedback and check-manifest suggestion!
Reply all
Reply to author
Forward
0 new messages