From 657c11db5f332c74eb0939bcdd3781ff9e0566e3 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Tue, 24 Oct 2017 14:44:49 +1100 Subject: [PATCH 1/4] Make version available to Python without dependencies; and to Sphinx metadata --- numpydoc/__init__.py | 5 ++++- numpydoc/numpydoc.py | 4 +++- setup.py | 6 +----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/numpydoc/__init__.py b/numpydoc/__init__.py index 5d64ad71..ca73374f 100644 --- a/numpydoc/__init__.py +++ b/numpydoc/__init__.py @@ -2,4 +2,7 @@ __version__ = '0.8.0.dev0' -from .numpydoc import setup + +def setup(*args, **kwargs): + from .numpydoc import setup + return setup(*args, **kwargs) diff --git a/numpydoc/numpydoc.py b/numpydoc/numpydoc.py index 7deecc55..e3b49b38 100644 --- a/numpydoc/numpydoc.py +++ b/numpydoc/numpydoc.py @@ -29,6 +29,7 @@ raise RuntimeError("Sphinx 1.0.1 or newer is required") from .docscrape_sphinx import get_doc_object, SphinxDocString +from . import __version__ if sys.version_info[0] >= 3: sixu = lambda s: s @@ -140,7 +141,8 @@ def setup(app, get_doc_object_=get_doc_object): app.add_domain(NumpyPythonDomain) app.add_domain(NumpyCDomain) - metadata = {'parallel_read_safe': True} + metadata = {'version': __version__, + 'parallel_read_safe': True} return metadata # ------------------------------------------------------------------------------ diff --git a/setup.py b/setup.py index a2dc46ad..dabc5bc4 100644 --- a/setup.py +++ b/setup.py @@ -10,11 +10,7 @@ if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[0:2] < (3, 4): raise RuntimeError("Python version 2.7 or >= 3.4 required.") -with open('numpydoc/__init__.py') as fid: - for line in fid: - if line.startswith('__version__'): - version = line.strip().split()[-1][1:-1] - break +from numpydoc import __version__ as version def read(fname): """Utility function to get README.rst into long_description. From dce027262f337981a1268bdfac88d70262e6e0ea Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Tue, 24 Oct 2017 14:51:59 +1100 Subject: [PATCH 2/4] Flake8 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index dabc5bc4..00cf4f2e 100644 --- a/setup.py +++ b/setup.py @@ -4,13 +4,13 @@ import os from distutils.command.sdist import sdist -import setuptools from distutils.core import setup +from numpydoc import __version__ as version + if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[0:2] < (3, 4): raise RuntimeError("Python version 2.7 or >= 3.4 required.") -from numpydoc import __version__ as version def read(fname): """Utility function to get README.rst into long_description. From b46e551cfe001146d01688e20bf2dcb6051991d6 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Wed, 1 Nov 2017 09:26:53 +1100 Subject: [PATCH 3/4] Add required arg to setup so that nose does not call it --- numpydoc/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/numpydoc/__init__.py b/numpydoc/__init__.py index ca73374f..30dba8fc 100644 --- a/numpydoc/__init__.py +++ b/numpydoc/__init__.py @@ -3,6 +3,6 @@ __version__ = '0.8.0.dev0' -def setup(*args, **kwargs): +def setup(app, *args, **kwargs): from .numpydoc import setup - return setup(*args, **kwargs) + return setup(app, *args, **kwargs) From ccfc13869c1be8941d7b045a0ecbf7096b4f0242 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 2 Nov 2017 09:18:11 +1100 Subject: [PATCH 4/4] Reinsert import of setuptools --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 00cf4f2e..ea42ecde 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ import sys import os +import setuptools # may monkeypatch distutils in some versions. # noqa from distutils.command.sdist import sdist from distutils.core import setup