Skip to content

Commit 0629a1d

Browse files
committed
Do not use datafiles in setup.py #280
* and other setup/packaging improvements Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent 05e4d92 commit 0629a1d

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

MANIFEST.in

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
1-
include *.ABOUT
2-
include about*
3-
include *LICENSE*
4-
include *NOTICE*
5-
include *README*
1+
graft src
2+
graft tests
3+
graft docs
4+
graft etc
5+
graft example
6+
graft thirdparty
7+
8+
prune src/aboutcode_toolkit.egg-info
9+
10+
include about.ABOUT
11+
include about
12+
include about.bat
13+
include about.cfg
14+
include apache-2.0.LICENSE
15+
include about.bat
16+
include apache-2.0.LICENSE
17+
include configure
18+
include configure.bat
19+
include MANIFEST.in
20+
include NOTICE
21+
include README.rst
22+
include setup.cfg
23+
include setup.py
24+
include SPEC
625
include USAGE.rst
7-
include *SPEC*
26+
include .travis.yml
27+
include appveyor.yml
828

9-
recursive-include tests/testdata *
10-
recursive-include about_code_tool/templates *
29+
global-exclude *.py[co] __pycache__ *.*~

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ universal = 1
55
license_file = NOTICE
66

77
[aliases]
8-
release = clean --all sdist --formats=bztar,zip bdist_wheel register upload
8+
release = clean --all sdist --formats=bztar,zip bdist_wheel
99

1010
[tool:pytest]
1111
norecursedirs =

setup.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,6 @@ def read(*names, **kwargs):
6666
'license', 'about', 'metadata', 'package', 'copyright',
6767
'attribution', 'software', 'inventory',
6868
],
69-
# FIXME: we SHOULD NOT use datafiles!!!! which is a mine field but
70-
# only package data or use a MANIFEST.in instead for a sdist
71-
data_files=[('about',
72-
[
73-
'about.ABOUT',
74-
'about.bat',
75-
'about',
76-
'configure.bat',
77-
'configure',
78-
'about.cfg',
79-
'README.rst',
80-
'apache-2.0.LICENSE',
81-
'NOTICE',
82-
'SPEC',
83-
'USAGE.rst',
84-
]),
85-
],
8669
install_requires=[
8770
'jinja2 >= 2.9, < 3.0',
8871
'click >= 6.7, < 7.0',

0 commit comments

Comments
 (0)