Merge lp:~elopio/selenium-simple-test/fix-setup2 into lp:selenium-simple-test

Proposed by Leo Arias
Status: Superseded
Proposed branch: lp:~elopio/selenium-simple-test/fix-setup2
Merge into: lp:selenium-simple-test
Diff against target: 16 lines (+2/-2)
1 file modified
setup.py (+2/-2)
To merge this branch: bzr merge lp:~elopio/selenium-simple-test/fix-setup2
Reviewer Review Type Date Requested Status
Corey Goldberg Pending
Review via email: mp+85424@code.launchpad.net

This proposal has been superseded by a proposal from 2011-12-13.

Commit message

Fixed the package_data to take the subdir files.
Added the init file to selftests.

Description of the change

Two more fixes for the setup.py:
Fixed the package_data to take the subdir files.
Added the init file to selftests.

To post a comment you must log in.
226. By Leo Arias

Use *.* on the regular expression so it matches files of any extension.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2011-12-09 20:39:56 +0000
3+++ setup.py 2011-12-13 15:04:23 +0000
4@@ -46,8 +46,8 @@
5 packages=PACKAGES,
6 scripts=SCRIPTS,
7 package_dir={'': 'src'},
8- package_data={'sst.selftests': ['*.csv', '_package/*', 'shared/*',
9- 'subdirectory/*']},
10+ package_data={'sst.selftests': ['*.csv', '_package/*.*', 'shared/*.*',
11+ 'shared/subdir/*.*', 'subdirectory/*.*']},
12
13 # metadata for upload to PyPI
14 author=AUTHOR,
15
16=== added file 'src/sst/selftests/__init__.py'

Subscribers

People subscribed via source and target branches