Changes between Initial Version and Version 1 of Ticket #2209, comment 6


Ignore:
Timestamp:
2014-03-29T01:04:11Z (11 years ago)
Author:
daira
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #2209, comment 6

    initial v1  
    11{{{
    2 (2014-03-29 00:14:03) daira1: dstufft: the only difference between the sdist that is installed correctly by pip (including the src/allmydata/web/static/img directory) and the sdist that is not installed correctly
    3 (2014-03-29 00:15:07) daira1: is that the former has 'allmydata.web.static.img', in the 'packages=' argument to setuptools.setup(...)
    4 (2014-03-29 00:15:52) daira1: however the 'package_data=' argument contains "allmydata.web.static.img": ["*.png"] in both cases
    5 (2014-03-29 00:16:01) daira1: is this a bug in pip and/or setuptools?
    6 (2014-03-29 00:16:30) dstufft: can you link me to the setup.py?
    7 (2014-03-29 00:16:39) dstufft: or the two setup.py's
    8 (2014-03-29 00:16:40) daira1: yes, just a sec
    9 (2014-03-29 00:19:50) daira1: with 'allmydata.web.static.img': https://github.com/tahoe-lafs/tahoe-lafs/blob/1931505518726256ff2e8becb5634910afbcf766/setup.py
    10 (2014-03-29 00:20:09) daira1: without: https://github.com/tahoe-lafs/tahoe-lafs/blob/master/setup.py
    11 (2014-03-29 00:20:47) daira1: diff: https://github.com/tahoe-lafs/tahoe-lafs/commit/1931505518726256ff2e8becb5634910afbcf766
    12 (2014-03-29 00:21:56) daira1: and here's the ticket: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2209
    13 (2014-03-29 00:22:45) daira1: I was under the impression that packages= was only supposed to contain source packages? I could be wrong about that
    14 (2014-03-29 00:25:33) dstufft: daira1: allmydata.web.static.img is a package, it has a __init__.py
    15 (2014-03-29 00:26:15) daira1: it has an __init__.py only to work around a setuptools bug
    16 (2014-03-29 00:26:38) dstufft: in order for that to work without allmydata.web.static.img in packages=[...] you'd need to set package_data={"allmydaa.web.static": ["img/*.png"]}
    17 (2014-03-29 00:26:59) daira1: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1960
    18 (2014-03-29 00:27:02) dstufft: in other words, the keys for package_data has to be installed packages
    19 (2014-03-29 00:27:19) daira1: ah, I see
    20 (2014-03-29 00:28:06) daira1: currently we have:
    21 (2014-03-29 00:28:06) daira1:       package_data={"allmydata.web": ["*.xhtml"],
    22 (2014-03-29 00:28:06) daira1:                     "allmydata.web.static": ["*.js", "*.png", "*.css"],
    23 (2014-03-29 00:28:06) daira1:                     "allmydata.web.static.css": ["*.css"],
    24 (2014-03-29 00:28:06) daira1:                     "allmydata.web.static.img": ["*.png"],
    25 (2014-03-29 00:28:06) daira1:                     },
    26 (2014-03-29 00:28:17) daira1: so that should be:
    27 (2014-03-29 00:28:40) daira1:       package_data={"allmydata.web": ["*.xhtml"],
    28 (2014-03-29 00:28:40) daira1:                     "allmydata.web.static": ["*.js", "*.png", "*.css", "img/*.png", "css/*.css"],
    29 (2014-03-29 00:28:40) daira1:                     },
    30 (2014-03-29 00:28:41) daira1: ?
    31 (2014-03-29 00:28:47) dstufft: Yea I think so
    32 (2014-03-29 00:29:02) dstufft: I'm not 100% sure on that, but I think so
    33 (2014-03-29 00:29:08) daira1: I'll try it
    34 (2014-03-29 00:29:10) daira1: thanks
    35 (2014-03-29 00:29:13) dstufft: np
    36 (2014-03-29 00:29:16) dstufft: let me know!
    37 (2014-03-29 00:29:22) ***daira1 nods
    38 (2014-03-29 00:30:57) daira1: hmm, or maybe:
    39 (2014-03-29 00:30:57) daira1:       package_data={"allmydata.web": ["*.xhtml", "static/*.js", "static/*.png",
    40 (2014-03-29 00:30:57) daira1:                                       "static/*.css", "static/img/*.png", "static/css/*.css"],
    41 (2014-03-29 00:30:57) daira1:                     },
     2daira1: dstufft: the only difference between the sdist that is installed correctly by pip (including the src/allmydata/web/static/img directory) and the sdist that is not installed correctly
     3daira1: is that the former has 'allmydata.web.static.img', in the 'packages=' argument to setuptools.setup(...)
     4daira1: however the 'package_data=' argument contains "allmydata.web.static.img": ["*.png"] in both cases
     5daira1: is this a bug in pip and/or setuptools?
     6dstufft: can you link me to the setup.py?
     7dstufft: or the two setup.py's
     8daira1: yes, just a sec
     9daira1: with 'allmydata.web.static.img': https://github.com/tahoe-lafs/tahoe-lafs/blob/1931505518726256ff2e8becb5634910afbcf766/setup.py
     10daira1: without: https://github.com/tahoe-lafs/tahoe-lafs/blob/master/setup.py
     11daira1: diff: https://github.com/tahoe-lafs/tahoe-lafs/commit/1931505518726256ff2e8becb5634910afbcf766
     12daira1: and here's the ticket: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2209
     13daira1: I was under the impression that packages= was only supposed to contain source packages? I could be wrong about that
     14dstufft: daira1: allmydata.web.static.img is a package, it has a __init__.py
     15daira1: it has an __init__.py only to work around a setuptools bug
     16dstufft: in order for that to work without allmydata.web.static.img in packages=[...] you'd need to set package_data={"allmydaa.web.static": ["img/*.png"]}
     17daira1: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1960
     18dstufft: in other words, the keys for package_data has to be installed packages
     19daira1: ah, I see
     20daira1: currently we have:
     21daira1:       package_data={"allmydata.web": ["*.xhtml"],
     22daira1:                     "allmydata.web.static": ["*.js", "*.png", "*.css"],
     23daira1:                     "allmydata.web.static.css": ["*.css"],
     24daira1:                     "allmydata.web.static.img": ["*.png"],
     25daira1:                     },
     26daira1: so that should be:
     27daira1:       package_data={"allmydata.web": ["*.xhtml"],
     28daira1:                     "allmydata.web.static": ["*.js", "*.png", "*.css", "img/*.png", "css/*.css"],
     29daira1:                     },
     30daira1: ?
     31dstufft: Yea I think so
     32dstufft: I'm not 100% sure on that, but I think so
     33daira1: I'll try it
     34daira1: thanks
     35dstufft: np
     36dstufft: let me know!
     37***daira1 nods
     38daira1: hmm, or maybe:
     39daira1:       package_data={"allmydata.web": ["*.xhtml", "static/*.js", "static/*.png",
     40daira1:                                       "static/*.css", "static/img/*.png", "static/css/*.css"],
     41daira1:                     },
    4242}}}
    4343