Opened 9 years ago

Closed 9 years ago

#13315 closed enhancement (fixed)

Clean up MANIFEST.in, spkg-delauto and spkg-dist

Reported by: jdemeyer Owned by: tbd
Priority: minor Milestone: sage-5.3
Component: distribution Keywords:
Cc: Merged in: sage-5.3.beta1
Authors: Jeroen Demeyer Reviewers: John Palmieri
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description (last modified by jdemeyer)

There are some obvious improvements and simplifications to be done to devel/sage/MANIFEST.in and devel/sage/spkg-dist.

Apply 13315_manifest.patch

Attachments (1)

13315_manifest.patch (17.5 KB) - added by jdemeyer 9 years ago.

Download all attachments as: .zip

Change History (16)

comment:1 Changed 9 years ago by jdemeyer

  • Description modified (diff)

comment:2 Changed 9 years ago by jdemeyer

  • Description modified (diff)
  • Summary changed from Clean up devel/sage/MANIFEST.in to Clean up devel/sage/MANIFEST.in and spkg-dist

comment:3 Changed 9 years ago by jdemeyer

  • Description modified (diff)

comment:4 Changed 9 years ago by jdemeyer

  • Description modified (diff)
  • Status changed from new to needs_review

comment:5 Changed 9 years ago by jdemeyer

  • Summary changed from Clean up devel/sage/MANIFEST.in and spkg-dist to Clean up MANIFEST.in, spkg-delauto and spkg-dist

comment:6 Changed 9 years ago by jdemeyer

I tested this patch by creating a new sdist (starting from sage-5.2), and these are the only differences in files being added or not (this is the diff of ls -a1RF output):

  • sage-5.2.

    old new  
    3030branch
    3131branch.cache
    3232branchheads.cache
     33cache/
    3334dirstate
    3435hgrc
    3536last-message.txt
     
    4142undo.desc
    4243undo.dirstate
    4344
     45./.hg/cache:
     46./
     47../
     48branchheads
     49tags
     50
    4451./.hg/store:
    4552./
    4653../
     
    495600manifest.d
    505700manifest.i
    5158data/
     59fncache
     60phaseroots
     61undo
     62undo.phaseroots
    5263
    5364./.hg/store/data:
    5465./
     
    51785189./c_lib:
    51795190./
    51805191../
    5181 .sconsign.dblite
    51825192SConstruct
    51835193include/
    51845194src/

comment:7 Changed 9 years ago by jhpalmieri

At first glance this seems okay to me. But why not more clean up, for example

  • MANIFEST.in

    diff --git a/MANIFEST.in b/MANIFEST.in
    a b  
    1 recursive-include * *.c *.cc *.cpp *.h *.hh *.hpp *.pyx *.pxd *.pxi *.txt *.tex
    2 recursive-include doc *.rst *.py *.inc
     1global-include *.c *.cc *.cpp *.h *.hh *.hpp *.py *.pyx *.pxd *.pxi *.txt *.tex
     2recursive-include doc *.rst *.inc
    33graft .hg
    44include .hgignore .hgtags
    55include MANIFEST.in
    66include bundle export install pull sage-push
    7 include module_list.py
    8 include fpickle_setup.py
    97include spkg-delauto spkg-dist spkg-install
    108include c_lib/SConstruct
    119include sage/ext/mac-app/README
    1210include sage/graphs/graph_decompositions/rankwidth_c/README
    13 include sage/libs/gmp/__init__.py
    14 include sage/libs/polybori/__init__.py
    15 include sage/numerical/test.py
    16 include sage/rings/polynomial/padics/__init__.py
    1711include sage/schemes/hyperelliptic_curves/hypellfrob/README
    18 include sage/server/notebook/templates/*
    19 include sage/server/notebook/templates/css/*
    20 include sage/server/notebook/templates/notebook/*
    21 include sage/server/notebook/templates/worksheet/*
    2212include sage/tests/french_book/README
     13graft sage/server/notebook/templates
     14graft sage/server/notebook/templates/css
     15graft sage/server/notebook/templates/notebook
     16graft sage/server/notebook/templates/worksheet
    2317include doc/common/python.inv
    2418include doc/common/update-python-inv.sh
    2519include doc/en/introspect/static/empty
    2620include doc/en/introspect/templates/layout.html
    27 include doc/en/numerical_sage/errors
    2821include doc/en/website/static/pdf.png
    2922include doc/en/website/templates/index.html
    3023include doc/en/a_tour_of_sage/eigen_plot.png

(Why do we include doc/en/numerical_sage/errors? Why don't we include all *.py files?)

comment:8 Changed 9 years ago by jhpalmieri

Also, regarding line 22 of spkg-dist:

	cp -pR .hg* doc sage c_lib tmp/

copying the entire doc directory can take a while, since we're copying all of the output. Would it be better to copy doc/common and doc/[a-z][a-z]?

comment:9 Changed 9 years ago by jdemeyer

  • Status changed from needs_review to needs_work

Good points.

comment:10 Changed 9 years ago by jdemeyer

  • Description modified (diff)
  • Status changed from needs_work to needs_review

comment:11 Changed 9 years ago by jhpalmieri

In line 1 of MANIFEST.in, should we replace recursive-include * ... with global-include ...? Then I think we can delete line 8 (include fpickle_setup.py module_list.py). In my testing, the results are the same with these changes.

comment:12 Changed 9 years ago by jdemeyer

  • Status changed from needs_review to needs_work

Changed 9 years ago by jdemeyer

comment:13 Changed 9 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:14 Changed 9 years ago by jhpalmieri

  • Reviewers set to John Palmieri
  • Status changed from needs_review to positive_review

Okay, this looks good to me.

comment:15 Changed 9 years ago by jdemeyer

  • Merged in set to sage-5.3.beta1
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.