diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-12-02 13:06:51 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2020-12-08 10:25:28 -0700 |
| commit | 40fd17e3a2418d54284b53dbcf2ba72dbfbb58ad (patch) | |
| tree | 6f302110dfb37a4fdfa1855a0d860d7873e355be /doc/Makefile | |
| parent | 4d290795d4e8c60053eb789acf173159dc4c1575 (diff) | |
| download | numpy-40fd17e3a2418d54284b53dbcf2ba72dbfbb58ad.tar.gz | |
ENH: Use versioneer to manage numpy versions.
The new tags look like '1.21.0.dev0+98.gaa0453721f', where '98' is the
number of commits since the 1.21.0 branch was started and 'aa0453721f'.
The chosen form may be specified in the 'setup.cfg' file. This PR adds
two new files 'numpy/_version.py' and 'numpy/version.py'. The latter
is kept because it is part of the public API and is actually used by
some downstream projects, but it is no longer dynamically created.
See https://github.com/python-versioneer/python-versioneer/ for more
information.
Diffstat (limited to 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/Makefile b/doc/Makefile index dd63702de..68d496389 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -49,7 +49,7 @@ help: @echo " show to show the html output in a browser" clean: - -rm -rf build/* + -rm -rf build/* find . -name generated -type d -prune -exec rm -rf "{}" ";" gitwash-update: @@ -66,7 +66,7 @@ gitwash-update: # Build the current numpy version, and extract docs from it. # We have to be careful of some issues: -# +# # - Everything must be done using the same Python version # - We must use eggs (otherwise they might override PYTHONPATH on import). # - Different versions of easy_install install to different directories (!) @@ -80,8 +80,7 @@ UPLOAD_DIR=/srv/docs_scipy_org/doc/numpy-$(RELEASE) DIST_VARS=SPHINXBUILD="LANG=C PYTHONPATH=$(INSTALL_PPH) python$(PYVER) `which sphinx-build`" PYTHON="PYTHONPATH=$(INSTALL_PPH) python$(PYVER)" NUMPYVER:=$(shell $(PYTHON) -c "import numpy; print(numpy.version.git_revision[:10])" 2>/dev/null) -GITVER ?= $(shell cd ..; $(PYTHON) -c "from setup import git_version; \ - print(git_version()[:10])") +GITVER ?= $(shell cd ..; $(PYTHON) -c "import versioneer as v; print(v.get_versions()['full-revisionid'][:10])") version-check: ifeq "$(GITVER)" "Unknown" @@ -163,7 +162,7 @@ endif @echo " <!-- insert here -->" @echo in build/merge/index.html, @echo then \"git commit\", \"git push\" - + #------------------------------------------------------------------------------ # Basic Sphinx generation rules for different formats |