diff options
| author | Kali Kaneko <kali@leap.se> | 2014-08-19 14:40:05 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-08-19 14:40:05 -0500 |
| commit | 87ad9b4093863fd02abd539f6bb34a63df41c3ce (patch) | |
| tree | b8aacd8c46eb29cd9b7208f7afc1fb41071df1cd /common | |
| parent | 6ba98af198db2884d1b43da90683bdb399a589c8 (diff) | |
| parent | cbf9ea06cebaf0a52ca958dd071c66952e70f1c8 (diff) | |
Merge remote-tracking branch 'drebs-github/bug/5896_include-ddocs-source-in-sdist' into develop
Diffstat (limited to 'common')
| -rw-r--r-- | common/MANIFEST.in | 1 | ||||
| -rw-r--r-- | common/changes/bug_5896_include-ddocs-source-in-sdist | 2 | ||||
| -rw-r--r-- | common/setup.py | 18 |
3 files changed, 3 insertions, 18 deletions
diff --git a/common/MANIFEST.in b/common/MANIFEST.in index 7f6148ef..8e5a2342 100644 --- a/common/MANIFEST.in +++ b/common/MANIFEST.in @@ -2,3 +2,4 @@ include pkg/* include versioneer.py include LICENSE include CHANGELOG +recursive-include src/leap/soledad/common/ddocs * diff --git a/common/changes/bug_5896_include-ddocs-source-in-sdist b/common/changes/bug_5896_include-ddocs-source-in-sdist new file mode 100644 index 00000000..94188f5e --- /dev/null +++ b/common/changes/bug_5896_include-ddocs-source-in-sdist @@ -0,0 +1,2 @@ + o Include couch design docs source files in source distribution and only + compile ddocs.py when building the package (#5896). diff --git a/common/setup.py b/common/setup.py index 6ee166ef..3650a15a 100644 --- a/common/setup.py +++ b/common/setup.py @@ -229,23 +229,6 @@ class cmd_develop(_cmd_develop): # versioneer powered -old_cmd_sdist = cmdclass["sdist"] - - -class cmd_sdist(old_cmd_sdist): - """ - Generate 'src/leap/soledad/common/ddocs.py' which contains couch design - documents scripts. - """ - def run(self): - old_cmd_sdist.run(self) - - def make_release_tree(self, base_dir, files): - old_cmd_sdist.make_release_tree(self, base_dir, files) - build_ddocs_py(basedir=base_dir) - - -# versioneer powered old_cmd_build = cmdclass["build"] @@ -257,7 +240,6 @@ class cmd_build(old_cmd_build): cmdclass["freeze_debianver"] = freeze_debianver cmdclass["build"] = cmd_build -cmdclass["sdist"] = cmd_sdist cmdclass["develop"] = cmd_develop |