Skip to content
Browse files

Merge pull request #235 from minrk/sdist

include libzmq sources in sdists

The next pyzmq sdist will be pip-installable without an internet connection.
  • Loading branch information...
2 parents 73013c6 + 36006d6 commit 021adea1bfe27246397da76720385f8dcdfeeb19 @minrk minrk committed
Showing with 10 additions and 3 deletions.
  1. +6 −0 MANIFEST.in
  2. +4 −3 setup.py
View
6 MANIFEST.in
@@ -12,6 +12,12 @@ graft docs
prune docs/build
prune docs/gh-pages
+graft bundled/uuid
+include bundled/zeromq/COPYING
+graft bundled/zeromq/include
+graft bundled/zeromq/src
+prune bundled/zeromq/src/Makefile*
+
graft buildutils
graft examples
graft zmq
View
7 setup.py
@@ -407,7 +407,7 @@ def fallback_on_bundled(self):
"",
" `--zmq=bundled`",
"",
- "I will now fetch the libzmq sources and build libzmq as a Python extension",
+ "I will now try to build libzmq as a Python extension",
"unless you interrupt me (^C) in the next 10 seconds...",
"",
]))
@@ -667,6 +667,7 @@ def initialize_options(self):
if f.endswith('.pyx'):
self._pyxfiles.append(pjoin(root, f))
def run(self):
+ self.run_command('fetch_libzmq')
if 'cython' in cmdclass:
self.run_command('cython')
else:
@@ -719,7 +720,8 @@ def run(self):
#-----------------------------------------------------------------------------
cmdclass = {'test':TestCommand, 'clean':CleanCommand, 'revision':GitRevisionCommand,
- 'configure': Configure, 'build': CopyingBuild, 'fetchbundle': FetchCommand,
+ 'configure': Configure, 'build': CopyingBuild, 'fetch_libzmq': FetchCommand,
+ 'sdist': CheckSDist,
}
def pxd(subdir, name):
@@ -787,7 +789,6 @@ def run(self):
cmdclass['cython'] = CythonCommand
cmdclass['build_ext'] = zbuild_ext
- cmdclass['sdist'] = CheckSDist
extensions = []
for submod, packages in submodules.items():

0 comments on commit 021adea

Please sign in to comment.
Something went wrong with that request. Please try again.