From 47e75366dfd9ca28b05eae6e784fc5602a0b2cdc Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jun 2024 11:15:22 +0200 Subject: [PATCH 1/7] use meson-python --- .gitattributes | 1 - .github/dependabot.yml | 15 + .github/workflows/tests.yml | 35 + .travis.yml | 56 - MANIFEST.in | 19 +- README.md | 26 + README.rst | 41 - meson.build | 175 ++ pyproject.toml | 59 + setup.cfg | 10 - setup.py | 91 - src/xcape/__init__.py | 5 - src/xcape/_version.py | 520 ----- versioneer.py | 1822 ----------------- xcape/__init__.py | 7 + {src/xcape => xcape}/cape_fortran.py | 0 {src/xcape => xcape}/cape_numba.py | 0 {src/xcape => xcape}/core.py | 0 {src/xcape => xcape}/duck_array_ops.py | 0 .../fortran/Bunkers_model_lev.f90 | 0 .../fortran/Bunkers_model_lev.pyf | 0 .../fortran/Bunkers_pressure_lev.f90 | 0 .../fortran/Bunkers_pressure_lev.pyf | 0 .../fortran/CAPE_CODE_model_lev.f90 | 0 .../fortran/CAPE_CODE_model_lev.pyf | 0 .../fortran/CAPE_CODE_pressure_lev.f90 | 0 .../fortran/CAPE_CODE_pressure_lev.pyf | 0 .../fortran/SREH_model_lev.f90 | 0 .../fortran/SREH_model_lev.pyf | 0 .../fortran/SREH_pressure_lev.f90 | 0 .../fortran/SREH_pressure_lev.pyf | 0 .../fortran/stdheight_2D_model_lev.f90 | 0 .../fortran/stdheight_2D_model_lev.pyf | 0 .../fortran/stdheight_2D_pressure_lev.f90 | 0 .../fortran/stdheight_2D_pressure_lev.pyf | 0 {src/xcape => xcape}/srh.py | 0 {src/xcape => xcape}/stdheight.py | 0 {src/xcape => xcape}/xarray.py | 0 38 files changed, 334 insertions(+), 2548 deletions(-) delete mode 100644 .gitattributes create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml create mode 100644 README.md delete mode 100644 README.rst create mode 100644 meson.build create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py delete mode 100644 src/xcape/__init__.py delete mode 100644 src/xcape/_version.py delete mode 100644 versioneer.py create mode 100644 xcape/__init__.py rename {src/xcape => xcape}/cape_fortran.py (100%) rename {src/xcape => xcape}/cape_numba.py (100%) rename {src/xcape => xcape}/core.py (100%) rename {src/xcape => xcape}/duck_array_ops.py (100%) rename {src/xcape => xcape}/fortran/Bunkers_model_lev.f90 (100%) rename {src/xcape => xcape}/fortran/Bunkers_model_lev.pyf (100%) rename {src/xcape => xcape}/fortran/Bunkers_pressure_lev.f90 (100%) rename {src/xcape => xcape}/fortran/Bunkers_pressure_lev.pyf (100%) rename {src/xcape => xcape}/fortran/CAPE_CODE_model_lev.f90 (100%) rename {src/xcape => xcape}/fortran/CAPE_CODE_model_lev.pyf (100%) rename {src/xcape => xcape}/fortran/CAPE_CODE_pressure_lev.f90 (100%) rename {src/xcape => xcape}/fortran/CAPE_CODE_pressure_lev.pyf (100%) rename {src/xcape => xcape}/fortran/SREH_model_lev.f90 (100%) rename {src/xcape => xcape}/fortran/SREH_model_lev.pyf (100%) rename {src/xcape => xcape}/fortran/SREH_pressure_lev.f90 (100%) rename {src/xcape => xcape}/fortran/SREH_pressure_lev.pyf (100%) rename {src/xcape => xcape}/fortran/stdheight_2D_model_lev.f90 (100%) rename {src/xcape => xcape}/fortran/stdheight_2D_model_lev.pyf (100%) rename {src/xcape => xcape}/fortran/stdheight_2D_pressure_lev.f90 (100%) rename {src/xcape => xcape}/fortran/stdheight_2D_pressure_lev.pyf (100%) rename {src/xcape => xcape}/srh.py (100%) rename {src/xcape => xcape}/stdheight.py (100%) rename {src/xcape => xcape}/xarray.py (100%) diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 82bc9ae..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -xcape/_version.py export-subst diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..7818bef --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# See https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + labels: + - "Bot" + groups: + github-actions: + patterns: + - '*' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..573c896 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,35 @@ +name: Full Tests + +on: + pull_request: + push: + # branches: [main] + +jobs: + run: + runs-on: ${{ matrix.os }} + strategy: + matrix: + python-version: [ "3.9", "3.10", "3.11", "3.12" ] + os: [ubuntu-latest] + fail-fast: false + + steps: + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + + - name: Setup Micromamba Python ${{ matrix.python-version }} + uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 #v1 + with: + environment-name: TEST + init-shell: bash + create-args: >- + python=${{ matrix.python-version }} pip python-build compilers --channel conda-forge + + - name: Install wheel and run tests + shell: bash -l {0} + run: > + python -m pip install -e . --no-deps --force-reinstall + && python -m build --wheel . --outdir dist + && cp -r test/ dist/ + && cd dist && pip install pytest *.whl + && python -m pytest -rxs test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 07c0985..0000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -# Based on http://conda.pydata.org/docs/travis.html -language: python -sudo: false # use container based build -notifications: - email: false - -env: - global: - - CONDA_PACKAGES="numpy>=1.16 xarray dask pytest" - -jobs: - fast_finish: true - include: - - python: 3.6 - env: DOCTEST=false - - python: 3.7 - env: DOCTEST=false - - python: 3.8 - env: DOCTEST=false -# uncomment once we are ready to do docs -# - python: 3.6 -# env: DOCTEST=true - -before_install: - - sudo apt-get install gfortran - - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then - wget http://repo.continuum.io/miniconda/Miniconda-3.16.0-Linux-x86_64.sh -O miniconda.sh; - else - wget http://repo.continuum.io/miniconda/Miniconda3-3.16.0-Linux-x86_64.sh -O miniconda.sh; - fi - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda update -q conda - - conda info -a - -install: - - conda create -n xcape_test_env python="$TRAVIS_PYTHON_VERSION" $CONDA_PACKAGES - - source activate xcape_test_env - - if [ $DOCTEST == 'false' ]; - then python setup.py build_ext; - fi - - pip install . - -before_script: - - pip install codecov pytest-cov - -script: - - if [ $DOCTEST == 'true' ]; - then cd doc; make html; - else py.test -v --cov=xcape --cov-config .coveragerc --cov-report term-missing test; - fi - -after_success: - - codecov diff --git a/MANIFEST.in b/MANIFEST.in index 488226f..8f5c287 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,18 @@ include LICENSE -include versioneer.py -include xcape/_version.py +include README.md +include pyproject.toml + +graft xcape + +prune .github +prune *.egg-info +prune doc +prune test + +exclude .coveragerc +exclude ruff.toml +exclude .gitignore +exclude .isort.cfg +exclude .pre-commit-config.yaml +exclude *.yml +exclude xcape/_version.py diff --git a/README.md b/README.md new file mode 100644 index 0000000..a462e4e --- /dev/null +++ b/README.md @@ -0,0 +1,26 @@ +# xcape + +Fast convective parameters for numpy, dask, and xarray + +[![pypi package](https://badge.fury.io/py/xcape.svg)](https://badge.fury.io/py/xcape) +[![conda +forge](https://anaconda.org/conda-forge/xcape/badges/version.svg)](https://anaconda.org/conda-forge/xcape) + +[![code coverage](https://codecov.io/github/xgcm/xcape/coverage.svg?branch=master)](https://codecov.io/github/xgcm/xcape?branch=master) +[![documentation status](https://readthedocs.org/projects/xcape/badge/?version=latest)](http://xcape.readthedocs.org/en/stable/?badge=latest) +[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/xgcm/xcape) +[![DOI](https://zenodo.org/badge/202226985.svg)](https://zenodo.org/badge/latestdoi/202226985) + +For more information, including installation instructions, read the full +[xcape documentation](https://xcape.readthedocs.io/en/latest/). + +## Funding Support + +Development of this package was supported by NSF award OCE-1740648 +(original Pangeo EarthCube award). + +## To Install Development Version + +```shell +python setup.py build_ext pip install -e . +``` diff --git a/README.rst b/README.rst deleted file mode 100644 index ae9b910..0000000 --- a/README.rst +++ /dev/null @@ -1,41 +0,0 @@ -xcape: Fast convective parameters for numpy, dask, and xarray -============================================================= - -|pypi| |conda forge| |Build Status| |codecov| |docs| |license| |DOI| - -For more information, including installation instructions, read the full -`xcape documentation `_. - -.. |conda forge| image:: https://anaconda.org/conda-forge/xcape/badges/version.svg - :target: https://anaconda.org/conda-forge/xcape -.. |DOI| image:: https://zenodo.org/badge/41581350.svg - :target: https://zenodo.org/badge/latestdoi/41581350 -.. |Build Status| image:: https://travis-ci.com/xgcm/xcape.svg?branch=master - :target: https://travis-ci.com/xgcm/xcape - :alt: travis-ci build status -.. |codecov| image:: https://codecov.io/github/xgcm/xcape/coverage.svg?branch=master - :target: https://codecov.io/github/xgcm/xcape?branch=master - :alt: code coverage -.. |pypi| image:: https://badge.fury.io/py/xcape.svg - :target: https://badge.fury.io/py/xcape - :alt: pypi package -.. |docs| image:: http://readthedocs.org/projects/xcape/badge/?version=latest - :target: http://xcape.readthedocs.org/en/stable/?badge=latest - :alt: documentation status -.. |license| image:: https://img.shields.io/github/license/mashape/apistatus.svg - :target: https://github.com/xgcm/xcape - :alt: license -.. |DOI| image:: https://zenodo.org/badge/202226985.svg - :target: https://zenodo.org/badge/latestdoi/202226985 - -Funding Support ---------------- - -Development of this package was supported by NSF award OCE-1740648 (original Pangeo EarthCube award). - - -To Install Development Version ------------------------------- - - python setup.py build_ext - pip install -e . diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..2af984e --- /dev/null +++ b/meson.build @@ -0,0 +1,175 @@ +project( + 'xcape', + ['c', 'fortran'], + version: '1.0', + meson_version: '>= 1.1.0', + default_options: ['warning_level=1', 'buildtype=release'] +) + +py = import('python').find_installation(pure: false) +py_dep = py.dependency() + +# NumPy include directory - needed in all submodules +incdir_numpy = run_command(py, + [ + '-c', + 'import os; os.chdir(".."); import numpy; print(numpy.get_include())' + ], + check: true +).stdout().strip() + +inc_np = include_directories(incdir_numpy) + +incdir_f2py = incdir_numpy / '..' / '..' / 'f2py' / 'src' +inc_f2py = include_directories(incdir_f2py) +fortranobject_c = incdir_f2py / 'fortranobject.c' + + +CAPE_CODE_model_lev = custom_target( + 'CAPE_CODE_model_lev', + input: ['xcape/fortran/CAPE_CODE_model_lev.pyf', 'xcape/fortran/CAPE_CODE_model_lev.f90'], + output: ['CAPE_CODE_model_levmodule.c', 'CAPE_CODE_model_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'CAPE_CODE_model_lev', '--lower'], +) + +py.extension_module( + 'CAPE_CODE_model_lev', + ['xcape/fortran/CAPE_CODE_model_lev.f90', CAPE_CODE_model_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +CAPE_CODE_pressure_lev = custom_target( + 'CAPE_CODE_pressure_lev', + input: ['xcape/fortran/CAPE_CODE_pressure_lev.pyf', 'xcape/fortran/CAPE_CODE_pressure_lev.f90'], + output: ['CAPE_CODE_pressure_levmodule.c', 'CAPE_CODE_pressure_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'CAPE_CODE_pressure_lev', '--lower'], +) + +py.extension_module( + 'CAPE_CODE_pressure_lev', + ['xcape/fortran/CAPE_CODE_pressure_lev.f90', CAPE_CODE_pressure_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +Bunkers_model_lev = custom_target( + 'Bunkers_model_lev', + input: ['xcape/fortran/Bunkers_model_lev.pyf', 'xcape/fortran/Bunkers_model_lev.f90'], + output: ['Bunkers_model_levmodule.c', 'Bunkers_model_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'Bunkers_model_lev', '--lower'], +) + +py.extension_module( + 'Bunkers_model_lev', + ['xcape/fortran/Bunkers_model_lev.f90', Bunkers_model_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +Bunkers_pressure_lev = custom_target( + 'Bunkers_pressure_lev', + input: ['xcape/fortran/Bunkers_pressure_lev.pyf', 'xcape/fortran/Bunkers_pressure_lev.f90'], + output: ['Bunkers_pressure_levmodule.c', 'Bunkers_pressure_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'Bunkers_pressure_lev', '--lower'], +) + +py.extension_module( + 'Bunkers_pressure_lev', + ['xcape/fortran/Bunkers_pressure_lev.f90', Bunkers_pressure_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +SREH_model_lev = custom_target( + 'SREH_model_lev', + input: ['xcape/fortran/SREH_model_lev.pyf', 'xcape/fortran/SREH_model_lev.f90'], + output: ['SREH_model_levmodule.c', 'SREH_model_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'SREH_model_lev', '--lower'], +) + +py.extension_module( + 'SREH_model_lev', + ['xcape/fortran/SREH_model_lev.f90', SREH_model_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +SREH_pressure_lev = custom_target( + 'SREH_pressure_lev', + input: ['xcape/fortran/SREH_pressure_lev.pyf', 'xcape/fortran/SREH_pressure_lev.f90'], + output: ['SREH_pressure_levmodule.c', 'SREH_pressure_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'SREH_pressure_lev', '--lower'], +) + +py.extension_module( + 'SREH_pressure_lev', + ['xcape/fortran/SREH_pressure_lev.f90', SREH_pressure_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +stdheight_2D_model_lev = custom_target( + 'stdheight_2D_model_lev', + input: ['xcape/fortran/stdheight_2D_model_lev.pyf', 'xcape/fortran/stdheight_2D_model_lev.f90'], + output: ['stdheight_2D_model_levmodule.c', 'stdheight_2D_model_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'stdheight_2D_model_lev', '--lower'], +) + +py.extension_module( + 'stdheight_2D_model_lev', + ['xcape/fortran/stdheight_2D_model_lev.f90', stdheight_2D_model_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + +stdheight_2D_pressure_lev = custom_target( + 'stdheight_2D_pressure_lev', + input: ['xcape/fortran/stdheight_2D_pressure_lev.pyf', 'xcape/fortran/stdheight_2D_pressure_lev.f90'], + output: ['stdheight_2D_pressure_levmodule.c', 'stdheight_2D_pressure_lev-f2pywrappers.f'], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'stdheight_2D_pressure_lev', '--lower'], +) + +py.extension_module( + 'stdheight_2D_pressure_lev', + ['xcape/fortran/stdheight_2D_pressure_lev.f90', stdheight_2D_pressure_lev], + fortranobject_c, + include_directories: [inc_np, inc_f2py], + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', +) + + +py.install_sources( + 'xcape/__init__.py', + 'xcape/cape_fortran.py', + 'xcape/cape_numba.py', + 'xcape/core.py', + 'xcape/duck_array_ops.py', + 'xcape/srh.py', + 'xcape/stdheight.py', + 'xcape/xarray.py', + subdir: 'xcape' +) diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..f7ff2f3 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,59 @@ +[build-system] +build-backend = "mesonpy" +requires = [ + "charset_normalizer", + "meson-python>=0.15", + "numpy>=2", + "setuptools_scm", +] + +[project] +name = "xcape" +description = "Fast convective parameters for numpy, dask, and xarray" +readme = "README.md" +license = {file = "LICENSE"} +authors = [ + {name = "xcape Developers", email = "rpa@ldeo.columbia.edu"}, +] +requires-python = ">=3.9" +classifiers = [ + 'Development Status :: 4 - Beta', + 'License :: OSI Approved :: Apache Software License', + 'Operating System :: OS Independent', + 'Intended Audience :: Science/Research', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Topic :: Scientific/Engineering', +] +dynamic = [ + "version", +] +dependencies = [ + "dask", + "numpy>=1.16", + "xarray>=0.14.1", +] + +[project.urls] +documentation = "https://xcape.readthedocs.io/en/latest/" +homepage = "https://github.com/xgcm/xcape" +repository = "https://github.com/xgcm/xcape" + +[tool.setuptools_scm] +write_to = "xcape/_version.py" +write_to_template = "__version__ = '{version}'" +tag_regex = "^(?Pv)?(?P[^\\+]+)(?P.*)?$" + +[tool.check-manifest] +ignore = [ + "*.yml", + ".coveragerc", + "doc", + "doc/*", + "test", + "test/*", +] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index c9be75c..0000000 --- a/setup.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[aliases] -test=pytest - -[versioneer] -VCS = git -style = pep440 -versionfile_source = xcape/_version.py -versionfile_build = xcape/_version.py -tag_prefix = v -parentdir_prefix = xcape- diff --git a/setup.py b/setup.py deleted file mode 100644 index adfc4b7..0000000 --- a/setup.py +++ /dev/null @@ -1,91 +0,0 @@ - #!/usr/bin/env python -import os -import re -import sys -import warnings -import versioneer -from setuptools import setup, find_packages -from numpy.distutils.core import setup, Extension -from numpy.distutils.fcompiler import get_default_fcompiler, CompilerNotFound - -DISTNAME = 'xcape' -LICENSE = 'MIT' -AUTHOR = 'xcape Developers' -AUTHOR_EMAIL = 'rpa@ldeo.columbia.edu' -URL = 'https://github.com/xgcm/xcape' -CLASSIFIERS = [ - 'Development Status :: 4 - Beta', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Intended Audience :: Science/Research', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Topic :: Scientific/Engineering', -] - -INSTALL_REQUIRES = ['xarray>=0.14.1', 'dask', 'numpy>=1.16'] -PYTHON_REQUIRES = '>=3.6' - -DESCRIPTION = "Fast convective parameters for numpy, dask, and xarray" -def readme(): - with open('README.rst') as f: - return f.read() - -# figure out which compiler we're going to use -compiler = get_default_fcompiler() -# set some fortran compiler-dependent flags -f90flags = [] -if compiler == 'gnu95': - f90flags.append('-fno-range-check') - f90flags.append('-ffree-form') -elif compiler == 'intel' or compiler == 'intelem': - f90flags.append('-132') -# Set aggressive optimization level -f90flags.append('-O3') -# Suppress all compiler warnings (avoid huge CI log files) -f90flags.append('-w') - - -extensions = [ - 'CAPE_CODE_model_lev', 'CAPE_CODE_pressure_lev', 'Bunkers_model_lev', - 'Bunkers_pressure_lev', 'SREH_model_lev', 'SREH_pressure_lev', - 'stdheight_2D_model_lev', 'stdheight_2D_pressure_lev' -] - -def _mk_sources(name): - return [f'src/xcape/fortran/{name}.pyf', - f'src/xcape/fortran/{name}.f90'] - -ext_modules = [Extension(name='fortran.' + name, - sources=_mk_sources(name), - extra_f90_compile_args=f90flags, - f2py_options=['--quiet']) - for name in extensions] - - -# https://github.com/readthedocs/readthedocs.org/issues/5512#issuecomment-475073310 -on_rtd = os.environ.get('READTHEDOCS') == 'True' -if on_rtd: - ext_modules = [] - INSTALL_REQUIRES = [] - -setup(name=DISTNAME, - version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), - license=LICENSE, - author=AUTHOR, - author_email=AUTHOR_EMAIL, - classifiers=CLASSIFIERS, - description=DESCRIPTION, - long_description=readme(), - install_requires=INSTALL_REQUIRES, - python_requires=PYTHON_REQUIRES, - url=URL, - package_dir={"": "src"}, - packages=find_packages("src"), - ext_package='xcape', - ext_modules=ext_modules - ) diff --git a/src/xcape/__init__.py b/src/xcape/__init__.py deleted file mode 100644 index 0275b5e..0000000 --- a/src/xcape/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions - -__all__ = ['core', 'xarray'] diff --git a/src/xcape/_version.py b/src/xcape/_version.py deleted file mode 100644 index 2aca665..0000000 --- a/src/xcape/_version.py +++ /dev/null @@ -1,520 +0,0 @@ - -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "$Format:%d$" - git_full = "$Format:%H$" - git_date = "$Format:%ci$" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "pep440" - cfg.tag_prefix = "v" - cfg.parentdir_prefix = "xgcm-" - cfg.versionfile_source = "xgcm/_version.py" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} diff --git a/versioneer.py b/versioneer.py deleted file mode 100644 index 64fea1c..0000000 --- a/versioneer.py +++ /dev/null @@ -1,1822 +0,0 @@ - -# Version: 0.18 - -"""The Versioneer - like a rocketeer, but for versions. - -The Versioneer -============== - -* like a rocketeer, but for versions! -* https://github.com/warner/python-versioneer -* Brian Warner -* License: Public Domain -* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy -* [![Latest Version] -(https://pypip.in/version/versioneer/badge.svg?style=flat) -](https://pypi.python.org/pypi/versioneer/) -* [![Build Status] -(https://travis-ci.org/warner/python-versioneer.png?branch=master) -](https://travis-ci.org/warner/python-versioneer) - -This is a tool for managing a recorded version number in distutils-based -python projects. The goal is to remove the tedious and error-prone "update -the embedded version string" step from your release process. Making a new -release should be as easy as recording a new tag in your version-control -system, and maybe making new tarballs. - - -## Quick Install - -* `pip install versioneer` to somewhere to your $PATH -* add a `[versioneer]` section to your setup.cfg (see below) -* run `versioneer install` in your source tree, commit the results - -## Version Identifiers - -Source trees come from a variety of places: - -* a version-control system checkout (mostly used by developers) -* a nightly tarball, produced by build automation -* a snapshot tarball, produced by a web-based VCS browser, like github's - "tarball from tag" feature -* a release tarball, produced by "setup.py sdist", distributed through PyPI - -Within each source tree, the version identifier (either a string or a number, -this tool is format-agnostic) can come from a variety of places: - -* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows - about recent "tags" and an absolute revision-id -* the name of the directory into which the tarball was unpacked -* an expanded VCS keyword ($Id$, etc) -* a `_version.py` created by some earlier build step - -For released software, the version identifier is closely related to a VCS -tag. Some projects use tag names that include more than just the version -string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool -needs to strip the tag prefix to extract the version identifier. For -unreleased software (between tags), the version identifier should provide -enough information to help developers recreate the same tree, while also -giving them an idea of roughly how old the tree is (after version 1.2, before -version 1.3). Many VCS systems can report a description that captures this, -for example `git describe --tags --dirty --always` reports things like -"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the -0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has -uncommitted changes. - -The version identifier is used for multiple purposes: - -* to allow the module to self-identify its version: `myproject.__version__` -* to choose a name and prefix for a 'setup.py sdist' tarball - -## Theory of Operation - -Versioneer works by adding a special `_version.py` file into your source -tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. - -`_version.py` also contains `$Revision$` markers, and the installation -process marks `_version.py` to have this marker rewritten with a tag name -during the `git archive` command. As a result, generated tarballs will -contain enough information to get the proper version. - -To allow `setup.py` to compute a version too, a `versioneer.py` is added to -the top level of your source tree, next to `setup.py` and the `setup.cfg` -that configures it. This overrides several distutils/setuptools commands to -compute the version when invoked, and changes `setup.py build` and `setup.py -sdist` to replace `_version.py` with a small static file that contains just -the generated version data. - -## Installation - -See [INSTALL.md](./INSTALL.md) for detailed installation instructions. - -## Version-String Flavors - -Code which uses Versioneer can learn about its version string at runtime by -importing `_version` from your main `__init__.py` file and running the -`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can -import the top-level `versioneer.py` and run `get_versions()`. - -Both functions return a dictionary with different flavors of version -information: - -* `['version']`: A condensed version string, rendered using the selected - style. This is the most commonly used value for the project's version - string. The default "pep440" style yields strings like `0.11`, - `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section - below for alternative styles. - -* `['full-revisionid']`: detailed revision identifier. For Git, this is the - full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". - -* `['date']`: Date and time of the latest `HEAD` commit. For Git, it is the - commit date in ISO 8601 format. This will be None if the date is not - available. - -* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that - this is only accurate if run in a VCS checkout, otherwise it is likely to - be False or None - -* `['error']`: if the version string could not be computed, this will be set - to a string describing the problem, otherwise it will be None. It may be - useful to throw an exception in setup.py if this is set, to avoid e.g. - creating tarballs with a version string of "unknown". - -Some variants are more useful than others. Including `full-revisionid` in a -bug report should allow developers to reconstruct the exact code being tested -(or indicate the presence of local changes that should be shared with the -developers). `version` is suitable for display in an "about" box or a CLI -`--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -The installer adds the following text to your `__init__.py` to place a basic -version in `YOURPROJECT.__version__`: - - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - -## Styles - -The setup.cfg `style=` configuration controls how the VCS information is -rendered into a version string. - -The default style, "pep440", produces a PEP440-compliant string, equal to the -un-prefixed tag name for actual releases, and containing an additional "local -version" section with more detail for in-between builds. For Git, this is -TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags ---dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the -tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and -that this commit is two revisions ("+2") beyond the "0.11" tag. For released -software (exactly equal to a known tag), the identifier will only contain the -stripped tag, e.g. "0.11". - -Other styles are available. See [details.md](details.md) in the Versioneer -source tree for descriptions. - -## Debugging - -Versioneer tries to avoid fatal errors: if something goes wrong, it will tend -to return a version of "0+unknown". To investigate the problem, run `setup.py -version`, which will run the version-lookup code in a verbose mode, and will -display the full contents of `get_versions()` (including the `error` string, -which may help identify what went wrong). - -## Known Limitations - -Some situations are known to cause problems for Versioneer. This details the -most significant ones. More can be found on Github -[issues page](https://github.com/warner/python-versioneer/issues). - -### Subprojects - -Versioneer has limited support for source trees in which `setup.py` is not in -the root directory (e.g. `setup.py` and `.git/` are *not* siblings). The are -two common reasons why `setup.py` might not be in the root: - -* Source trees which contain multiple subprojects, such as - [Buildbot](https://github.com/buildbot/buildbot), which contains both - "master" and "slave" subprojects, each with their own `setup.py`, - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). -* Source trees whose main purpose is to contain a C library, but which also - provide bindings to Python (and perhaps other langauges) in subdirectories. - -Versioneer will look for `.git` in parent directories, and most operations -should get the right version string. However `pip` and `setuptools` have bugs -and implementation details which frequently cause `pip install .` from a -subproject directory to fail to find a correct version string (so it usually -defaults to `0+unknown`). - -`pip install --editable .` should work correctly. `setup.py install` might -work too. - -Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in -some later version. - -[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -this issue. The discussion in -[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -issue from the Versioneer side in more detail. -[pip PR#3176](https://github.com/pypa/pip/pull/3176) and -[pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -pip to let Versioneer work correctly. - -Versioneer-0.16 and earlier only looked for a `.git` directory next to the -`setup.cfg`, so subprojects were completely unsupported with those releases. - -### Editable installs with setuptools <= 18.5 - -`setup.py develop` and `pip install --editable .` allow you to install a -project into a virtualenv once, then continue editing the source code (and -test) without re-installing after every change. - -"Entry-point scripts" (`setup(entry_points={"console_scripts": ..})`) are a -convenient way to specify executable scripts that should be installed along -with the python package. - -These both work as expected when using modern setuptools. When using -setuptools-18.5 or earlier, however, certain operations will cause -`pkg_resources.DistributionNotFound` errors when running the entrypoint -script, which must be resolved by re-installing the package. This happens -when the install happens with one version, then the egg_info data is -regenerated while a different version is checked out. Many setup.py commands -cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into -a different virtualenv), so this can be surprising. - -[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -this one, but upgrading to a newer version of setuptools should probably -resolve it. - -### Unicode version strings - -While Versioneer works (and is continually tested) with both Python 2 and -Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. -Newer releases probably generate unicode version strings on py2. It's not -clear that this is wrong, but it may be surprising for applications when then -write these strings to a network connection or include them in bytes-oriented -APIs like cryptographic checksums. - -[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates -this question. - - -## Updating Versioneer - -To upgrade your project to a new release of Versioneer, do the following: - -* install the new Versioneer (`pip install -U versioneer` or equivalent) -* edit `setup.cfg`, if necessary, to include any new configuration settings - indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. -* re-run `versioneer install` in your source tree, to replace - `SRC/_version.py` -* commit any changed files - -## Future Directions - -This tool is designed to make it easily extended to other version-control -systems: all VCS-specific components are in separate directories like -src/git/ . The top-level `versioneer.py` script is assembled from these -components by running make-versioneer.py . In the future, make-versioneer.py -will take a VCS name as an argument, and will construct a version of -`versioneer.py` that is specific to the given VCS. It might also take the -configuration arguments that are currently provided manually during -installation by editing setup.py . Alternatively, it might go the other -direction and include code from all supported VCS systems, reducing the -number of intermediate scripts. - - -## License - -To make Versioneer easier to embed, all its code is dedicated to the public -domain. The `_version.py` that it creates is also in the public domain. -Specifically, both are released under the Creative Commons "Public Domain -Dedication" license (CC0-1.0), as described in -https://creativecommons.org/publicdomain/zero/1.0/ . - -""" - -from __future__ import print_function -try: - import configparser -except ImportError: - import ConfigParser as configparser -import errno -import json -import os -import re -import subprocess -import sys - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_root(): - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the - directory that contains setup.py, setup.cfg, and versioneer.py . - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") - versioneer_py = os.path.join(root, "versioneer.py") - if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): - err = ("Versioneer was unable to run the project root directory. " - "Versioneer requires setup.py to be executed from " - "its immediate directory (like 'python setup.py COMMAND'), " - "or in a way that lets it use sys.argv[0] to find the root " - "(like 'python path/to/setup.py COMMAND').") - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools - # tree) execute all dependencies in a single python process, so - # "versioneer" may be imported multiple times, and python's shared - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. - me = os.path.realpath(os.path.abspath(__file__)) - me_dir = os.path.normcase(os.path.splitext(me)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) - if me_dir != vsr_dir: - print("Warning: build in %s is using versioneer.py from %s" - % (os.path.dirname(me), versioneer_py)) - except NameError: - pass - return root - - -def get_config_from_root(root): - """Read the project setup.cfg file to determine Versioneer config.""" - # This might raise EnvironmentError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: - parser.readfp(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): - if parser.has_option("versioneer", name): - return parser.get("versioneer", name) - return None - cfg = VersioneerConfig() - cfg.VCS = VCS - cfg.style = get(parser, "style") or "" - cfg.versionfile_source = get(parser, "versionfile_source") - cfg.versionfile_build = get(parser, "versionfile_build") - cfg.tag_prefix = get(parser, "tag_prefix") - if cfg.tag_prefix in ("''", '""'): - cfg.tag_prefix = "" - cfg.parentdir_prefix = get(parser, "parentdir_prefix") - cfg.verbose = get(parser, "verbose") - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -# these dictionaries contain VCS-specific tools -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) - return None, p.returncode - return stdout, p.returncode - - -LONG_VERSION_PY['git'] = ''' -# This file helps to compute a version number in source trees obtained from -# git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (built by setup.py sdist) and build -# directories (produced by setup.py build) will contain a much shorter file -# that just contains the computed version number. - -# This file is released into the public domain. Generated by -# versioneer-0.18 (https://github.com/warner/python-versioneer) - -"""Git implementation of _version.py.""" - -import errno -import os -import re -import subprocess -import sys - - -def get_keywords(): - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must - # each be defined on a line of their own. _version.py will just call - # get_keywords(). - git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" - git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" - git_date = "%(DOLLAR)sFormat:%%ci%(DOLLAR)s" - keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} - return keywords - - -class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - - -def get_config(): - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py - cfg = VersioneerConfig() - cfg.VCS = "git" - cfg.style = "%(STYLE)s" - cfg.tag_prefix = "%(TAG_PREFIX)s" - cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" - cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" - cfg.verbose = False - return cfg - - -class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - -LONG_VERSION_PY = {} -HANDLERS = {} - - -def register_vcs_handler(vcs, method): # decorator - """Decorator to mark a method as the handler for a particular VCS.""" - def decorate(f): - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} - HANDLERS[vcs][method] = f - return f - return decorate - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - env=None): - """Call the given command(s).""" - assert isinstance(commands, list) - p = None - for c in commands: - try: - dispcmd = str([c] + args) - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, env=env, - stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %%s" %% dispcmd) - print(e) - return None, None - else: - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None - stdout = p.communicate()[0].strip() - if sys.version_info[0] >= 3: - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) - return None, p.returncode - return stdout, p.returncode - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: - print("likely tags: %%s" %% ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %%s" %% r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%%s*" %% tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%%s' doesn't start with prefix '%%s'" - print(fmt %% (full_tag, tag_prefix)) - pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" - %% (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%%d" %% pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%%d" %% pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%%s" %% pieces["short"] - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%%s" %% pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%%d" %% pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%%s'" %% style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -def get_versions(): - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some - # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded keywords. - - cfg = get_config() - verbose = cfg.verbose - - try: - return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, - verbose) - except NotThisMethod: - pass - - try: - root = os.path.realpath(__file__) - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. - for i in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to find root of source tree", - "date": None} - - try: - pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) - return render(pieces, cfg.style) - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - except NotThisMethod: - pass - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, - "error": "unable to compute version", "date": None} -''' - - -@register_vcs_handler("git", "get_keywords") -def git_get_keywords(versionfile_abs): - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. - keywords = {} - try: - f = open(versionfile_abs, "r") - for line in f.readlines(): - if line.strip().startswith("git_refnames ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["refnames"] = mo.group(1) - if line.strip().startswith("git_full ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["full"] = mo.group(1) - if line.strip().startswith("git_date ="): - mo = re.search(r'=\s*"(.*)"', line) - if mo: - keywords["date"] = mo.group(1) - f.close() - except EnvironmentError: - pass - return keywords - - -@register_vcs_handler("git", "keywords") -def git_versions_from_keywords(keywords, tag_prefix, verbose): - """Get version information from git keywords.""" - if not keywords: - raise NotThisMethod("no keywords at all, weird") - date = keywords.get("date") - if date is not None: - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because - # it's been around since git-1.5.3, and it's too difficult to - # discover which version we're using, or to work around using an - # older one. - date = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - refnames = keywords["refnames"].strip() - if refnames.startswith("$Format"): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " - tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d - # expansion behaves like git log --decorate=short and strips out the - # refs/heads/ and refs/tags/ prefixes that would let us distinguish - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r'\d', r)]) - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] - if verbose: - print("picking %s" % r) - return {"version": r, - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": None, - "date": date} - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") - return {"version": "0+unknown", - "full-revisionid": keywords["full"].strip(), - "dirty": False, "error": "no suitable tags", "date": None} - - -@register_vcs_handler("git", "pieces_from_vcs") -def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* - expanded, and _version.py hasn't already been rewritten with a short - version string, meaning we're inside a checked out source tree. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - - out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, - hide_stderr=True) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) - raise NotThisMethod("'git rev-parse --git-dir' returned error") - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) - describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", - "--always", "--long", - "--match", "%s*" % tag_prefix], - cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() - full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - - pieces = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out - - # look for -dirty suffix - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: - git_describe = git_describe[:git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: - # unparseable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%s'" - % describe_out) - return pieces - - # tag - full_tag = mo.group(1) - if not full_tag.startswith(tag_prefix): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) - pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" - % (full_tag, tag_prefix)) - return pieces - pieces["closest-tag"] = full_tag[len(tag_prefix):] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) - - # commit: short hex revision ID - pieces["short"] = mo.group(3) - - else: - # HEX: no tags - pieces["closest-tag"] = None - count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], - cwd=root) - pieces["distance"] = int(count_out) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() - date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], - cwd=root)[0].strip() - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - -def do_vcs_install(manifest_in, versionfile_source, ipy): - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py - for export-subst keyword substitution. - """ - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source] - if ipy: - files.append(ipy) - try: - me = __file__ - if me.endswith(".pyc") or me.endswith(".pyo"): - me = os.path.splitext(me)[0] + ".py" - versioneer_file = os.path.relpath(me) - except NameError: - versioneer_file = "versioneer.py" - files.append(versioneer_file) - present = False - try: - f = open(".gitattributes", "r") - for line in f.readlines(): - if line.strip().startswith(versionfile_source): - if "export-subst" in line.strip().split()[1:]: - present = True - f.close() - except EnvironmentError: - pass - if not present: - f = open(".gitattributes", "a+") - f.write("%s export-subst\n" % versionfile_source) - f.close() - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - -def versions_from_parentdir(parentdir_prefix, root, verbose): - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both - the project name and a version string. We will also support searching up - two directory levels for an appropriately named parent directory - """ - rootdirs = [] - - for i in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} - else: - rootdirs.append(root) - root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %s but none started with prefix %s" % - (str(rootdirs), parentdir_prefix)) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - -SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.18) from -# revision-control system data, or from the parent directory name of an -# unpacked source archive. Distribution tarballs contain a pre-generated copy -# of this file. - -import json - -version_json = ''' -%s -''' # END VERSION_JSON - - -def get_versions(): - return json.loads(version_json) -""" - - -def versions_from_file(filename): - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() - except EnvironmentError: - raise NotThisMethod("unable to read _version.py") - mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", - contents, re.M | re.S) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - -def write_to_version_file(filename, versions): - """Write the given version number to the given _version.py file.""" - os.unlink(filename) - contents = json.dumps(versions, sort_keys=True, - indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - -def plus_or_dot(pieces): - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - -def render_pep440(pieces): - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you - get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - - Exceptions: - 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += plus_or_dot(pieces) - rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - else: - # exception #1 - rendered = "0+untagged.%d.g%s" % (pieces["distance"], - pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - -def render_pep440_pre(pieces): - """TAG[.post.devDISTANCE] -- No -dirty. - - Exceptions: - 1: no tags. 0.post.devDISTANCE - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += ".post.dev%d" % pieces["distance"] - else: - # exception #1 - rendered = "0.post.dev%d" % pieces["distance"] - return rendered - - -def render_pep440_post(pieces): - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards - (a dirty tree will appear "older" than the corresponding clean one), - but you shouldn't be releasing software with -dirty anyways. - - Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += plus_or_dot(pieces) - rendered += "g%s" % pieces["short"] - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - rendered += "+g%s" % pieces["short"] - return rendered - - -def render_pep440_old(pieces): - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - - Eexceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"] or pieces["dirty"]: - rendered += ".post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - else: - # exception #1 - rendered = "0.post%d" % pieces["distance"] - if pieces["dirty"]: - rendered += ".dev0" - return rendered - - -def render_git_describe(pieces): - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - if pieces["distance"]: - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render_git_describe_long(pieces): - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. - The distance/hash is unconditional. - - Exceptions: - 1: no tags. HEX[-dirty] (note: no 'g' prefix) - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] - rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) - else: - # exception #1 - rendered = pieces["short"] - if pieces["dirty"]: - rendered += "-dirty" - return rendered - - -def render(pieces, style): - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", - "full-revisionid": pieces.get("long"), - "dirty": None, - "error": pieces["error"], - "date": None} - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": - rendered = render_git_describe(pieces) - elif style == "git-describe-long": - rendered = render_git_describe_long(pieces) - else: - raise ValueError("unknown style '%s'" % style) - - return {"version": rendered, "full-revisionid": pieces["long"], - "dirty": pieces["dirty"], "error": None, - "date": pieces.get("date")} - - -class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - -def get_versions(verbose=False): - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. - """ - if "versioneer" in sys.modules: - # see the discussion in cmdclass.py:get_cmdclass() - del sys.modules["versioneer"] - - root = get_root() - cfg = get_config_from_root(root) - - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS - verbose = verbose or cfg.verbose - assert cfg.versionfile_source is not None, \ - "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) - - # extract version from first of: _version.py, VCS command (e.g. 'git - # describe'), parentdir. This is meant to work for developers using a - # source checkout, for users of a tarball created by 'setup.py sdist', - # and for users of a tarball/zipball created by 'git archive' or github's - # download-from-tag feature or the equivalent in other VCSes. - - get_keywords_f = handlers.get("get_keywords") - from_keywords_f = handlers.get("keywords") - if get_keywords_f and from_keywords_f: - try: - keywords = get_keywords_f(versionfile_abs) - ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) - if verbose: - print("got version from expanded keyword %s" % ver) - return ver - except NotThisMethod: - pass - - try: - ver = versions_from_file(versionfile_abs) - if verbose: - print("got version from file %s %s" % (versionfile_abs, ver)) - return ver - except NotThisMethod: - pass - - from_vcs_f = handlers.get("pieces_from_vcs") - if from_vcs_f: - try: - pieces = from_vcs_f(cfg.tag_prefix, root, verbose) - ver = render(pieces, cfg.style) - if verbose: - print("got version from VCS %s" % ver) - return ver - except NotThisMethod: - pass - - try: - if cfg.parentdir_prefix: - ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) - if verbose: - print("got version from parentdir %s" % ver) - return ver - except NotThisMethod: - pass - - if verbose: - print("unable to compute version") - - return {"version": "0+unknown", "full-revisionid": None, - "dirty": None, "error": "unable to compute version", - "date": None} - - -def get_version(): - """Get the short version string for this project.""" - return get_versions()["version"] - - -def get_cmdclass(): - """Get the custom setuptools/distutils subclasses used by Versioneer.""" - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and - # 'easy_install .'), in which subdependencies of the main project are - # built (using setup.py bdist_egg) in the same python process. Assume - # a main project A and a dependency B, which use different versions - # of Versioneer. A's setup.py imports A's Versioneer, leaving it in - # sys.modules by the time B's setup.py is executed, causing B to run - # with the wrong versioneer. Setuptools wraps the sub-dep builds in a - # sandbox that restores sys.modules to it's pre-build state, so the - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. - # Also see https://github.com/warner/python-versioneer/issues/52 - - cmds = {} - - # we add "version" to both distutils and setuptools - from distutils.core import Command - - class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) - print(" dirty: %s" % vers.get("dirty")) - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) - cmds["version"] = cmd_version - - # we override "build_py" in both distutils and setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py - # distutils/install -> distutils/build ->.. - # setuptools/bdist_wheel -> distutils/install ->.. - # setuptools/bdist_egg -> distutils/install_lib -> build_py - # setuptools/install -> bdist_egg ->.. - # setuptools/develop -> ? - # pip install: - # copies source tree to a tempdir before running egg_info/etc - # if .git isn't copied too, 'git describe' will fail - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - - # we override different "build_py" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.build_py import build_py as _build_py - else: - from distutils.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: - target_versionfile = os.path.join(self.build_lib, - cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - cmds["build_py"] = cmd_build_py - - if "cx_Freeze" in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ - # "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION - # "product_version": versioneer.get_version(), - # ... - - class cmd_build_exe(_build_exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _build_exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - - if 'py2exe' in sys.modules: # py2exe enabled? - try: - from py2exe.distutils_buildexe import py2exe as _py2exe # py3 - except ImportError: - from py2exe.build_exe import py2exe as _py2exe # py2 - - class cmd_py2exe(_py2exe): - def run(self): - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - target_versionfile = cfg.versionfile_source - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) - - _py2exe.run(self) - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % - {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - cmds["py2exe"] = cmd_py2exe - - # we override different "sdist" commands for both environments - if "setuptools" in sys.modules: - from setuptools.command.sdist import sdist as _sdist - else: - from distutils.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): - def run(self): - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old - # version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory - # (remembering that it may be a hardlink) and replace it with an - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, - self._versioneer_generated_versions) - cmds["sdist"] = cmd_sdist - - return cmds - - -CONFIG_ERROR = """ -setup.cfg is missing the necessary Versioneer configuration. You need -a section like: - - [versioneer] - VCS = git - style = pep440 - versionfile_source = src/myproject/_version.py - versionfile_build = myproject/_version.py - tag_prefix = - parentdir_prefix = myproject- - -You will also need to edit your setup.py to use the results: - - import versioneer - setup(version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), ...) - -Please read the docstring in ./versioneer.py for configuration instructions, -edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. -""" - -SAMPLE_CONFIG = """ -# See the docstring in versioneer.py for instructions. Note that you must -# re-run 'versioneer.py setup' after changing this section, and commit the -# resulting files. - -[versioneer] -#VCS = git -#style = pep440 -#versionfile_source = -#versionfile_build = -#tag_prefix = -#parentdir_prefix = - -""" - -INIT_PY_SNIPPET = """ -from ._version import get_versions -__version__ = get_versions()['version'] -del get_versions -""" - - -def do_setup(): - """Main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) - except (EnvironmentError, configparser.NoSectionError, - configparser.NoOptionError) as e: - if isinstance(e, (EnvironmentError, configparser.NoSectionError)): - print("Adding sample versioneer config to setup.cfg", - file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) - return 1 - - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] - f.write(LONG % {"DOLLAR": "$", - "STYLE": cfg.style, - "TAG_PREFIX": cfg.tag_prefix, - "PARENTDIR_PREFIX": cfg.parentdir_prefix, - "VERSIONFILE_SOURCE": cfg.versionfile_source, - }) - - ipy = os.path.join(os.path.dirname(cfg.versionfile_source), - "__init__.py") - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() - except EnvironmentError: - old = "" - if INIT_PY_SNIPPET not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: - f.write(INIT_PY_SNIPPET) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) - ipy = None - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(root, "MANIFEST.in") - simple_includes = set() - try: - with open(manifest_in, "r") as f: - for line in f: - if line.startswith("include "): - for include in line.split()[1:]: - simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - with open(manifest_in, "a") as f: - f.write("include versioneer.py\n") - else: - print(" 'versioneer.py' already in MANIFEST.in") - if cfg.versionfile_source not in simple_includes: - print(" appending versionfile_source ('%s') to MANIFEST.in" % - cfg.versionfile_source) - with open(manifest_in, "a") as f: - f.write("include %s\n" % cfg.versionfile_source) - else: - print(" versionfile_source already in MANIFEST.in") - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. - do_vcs_install(manifest_in, cfg.versionfile_source, ipy) - return 0 - - -def scan_setup_py(): - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False - errors = 0 - with open("setup.py", "r") as f: - for line in f.readlines(): - if "import versioneer" in line: - found.add("import") - if "versioneer.get_cmdclass()" in line: - found.add("cmdclass") - if "versioneer.get_version()" in line: - found.add("get_version") - if "versioneer.VCS" in line: - setters = True - if "versioneer.versionfile_source" in line: - setters = True - if len(found) != 3: - print("") - print("Your setup.py appears to be missing some important items") - print("(but I might be wrong). Please make sure it has something") - print("roughly like the following:") - print("") - print(" import versioneer") - print(" setup( version=versioneer.get_version(),") - print(" cmdclass=versioneer.get_cmdclass(), ...)") - print("") - errors += 1 - if setters: - print("You should remove lines like 'versioneer.VCS = ' and") - print("'versioneer.versionfile_source = ' . This configuration") - print("now lives in setup.cfg, and should be removed from setup.py") - print("") - errors += 1 - return errors - - -if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": - errors = do_setup() - errors += scan_setup_py() - if errors: - sys.exit(1) diff --git a/xcape/__init__.py b/xcape/__init__.py new file mode 100644 index 0000000..2677cf1 --- /dev/null +++ b/xcape/__init__.py @@ -0,0 +1,7 @@ +try: + from ._version import __version__ +except ImportError: + __version__ = "unknown" + + +__all__ = ['core', 'xarray'] diff --git a/src/xcape/cape_fortran.py b/xcape/cape_fortran.py similarity index 100% rename from src/xcape/cape_fortran.py rename to xcape/cape_fortran.py diff --git a/src/xcape/cape_numba.py b/xcape/cape_numba.py similarity index 100% rename from src/xcape/cape_numba.py rename to xcape/cape_numba.py diff --git a/src/xcape/core.py b/xcape/core.py similarity index 100% rename from src/xcape/core.py rename to xcape/core.py diff --git a/src/xcape/duck_array_ops.py b/xcape/duck_array_ops.py similarity index 100% rename from src/xcape/duck_array_ops.py rename to xcape/duck_array_ops.py diff --git a/src/xcape/fortran/Bunkers_model_lev.f90 b/xcape/fortran/Bunkers_model_lev.f90 similarity index 100% rename from src/xcape/fortran/Bunkers_model_lev.f90 rename to xcape/fortran/Bunkers_model_lev.f90 diff --git a/src/xcape/fortran/Bunkers_model_lev.pyf b/xcape/fortran/Bunkers_model_lev.pyf similarity index 100% rename from src/xcape/fortran/Bunkers_model_lev.pyf rename to xcape/fortran/Bunkers_model_lev.pyf diff --git a/src/xcape/fortran/Bunkers_pressure_lev.f90 b/xcape/fortran/Bunkers_pressure_lev.f90 similarity index 100% rename from src/xcape/fortran/Bunkers_pressure_lev.f90 rename to xcape/fortran/Bunkers_pressure_lev.f90 diff --git a/src/xcape/fortran/Bunkers_pressure_lev.pyf b/xcape/fortran/Bunkers_pressure_lev.pyf similarity index 100% rename from src/xcape/fortran/Bunkers_pressure_lev.pyf rename to xcape/fortran/Bunkers_pressure_lev.pyf diff --git a/src/xcape/fortran/CAPE_CODE_model_lev.f90 b/xcape/fortran/CAPE_CODE_model_lev.f90 similarity index 100% rename from src/xcape/fortran/CAPE_CODE_model_lev.f90 rename to xcape/fortran/CAPE_CODE_model_lev.f90 diff --git a/src/xcape/fortran/CAPE_CODE_model_lev.pyf b/xcape/fortran/CAPE_CODE_model_lev.pyf similarity index 100% rename from src/xcape/fortran/CAPE_CODE_model_lev.pyf rename to xcape/fortran/CAPE_CODE_model_lev.pyf diff --git a/src/xcape/fortran/CAPE_CODE_pressure_lev.f90 b/xcape/fortran/CAPE_CODE_pressure_lev.f90 similarity index 100% rename from src/xcape/fortran/CAPE_CODE_pressure_lev.f90 rename to xcape/fortran/CAPE_CODE_pressure_lev.f90 diff --git a/src/xcape/fortran/CAPE_CODE_pressure_lev.pyf b/xcape/fortran/CAPE_CODE_pressure_lev.pyf similarity index 100% rename from src/xcape/fortran/CAPE_CODE_pressure_lev.pyf rename to xcape/fortran/CAPE_CODE_pressure_lev.pyf diff --git a/src/xcape/fortran/SREH_model_lev.f90 b/xcape/fortran/SREH_model_lev.f90 similarity index 100% rename from src/xcape/fortran/SREH_model_lev.f90 rename to xcape/fortran/SREH_model_lev.f90 diff --git a/src/xcape/fortran/SREH_model_lev.pyf b/xcape/fortran/SREH_model_lev.pyf similarity index 100% rename from src/xcape/fortran/SREH_model_lev.pyf rename to xcape/fortran/SREH_model_lev.pyf diff --git a/src/xcape/fortran/SREH_pressure_lev.f90 b/xcape/fortran/SREH_pressure_lev.f90 similarity index 100% rename from src/xcape/fortran/SREH_pressure_lev.f90 rename to xcape/fortran/SREH_pressure_lev.f90 diff --git a/src/xcape/fortran/SREH_pressure_lev.pyf b/xcape/fortran/SREH_pressure_lev.pyf similarity index 100% rename from src/xcape/fortran/SREH_pressure_lev.pyf rename to xcape/fortran/SREH_pressure_lev.pyf diff --git a/src/xcape/fortran/stdheight_2D_model_lev.f90 b/xcape/fortran/stdheight_2D_model_lev.f90 similarity index 100% rename from src/xcape/fortran/stdheight_2D_model_lev.f90 rename to xcape/fortran/stdheight_2D_model_lev.f90 diff --git a/src/xcape/fortran/stdheight_2D_model_lev.pyf b/xcape/fortran/stdheight_2D_model_lev.pyf similarity index 100% rename from src/xcape/fortran/stdheight_2D_model_lev.pyf rename to xcape/fortran/stdheight_2D_model_lev.pyf diff --git a/src/xcape/fortran/stdheight_2D_pressure_lev.f90 b/xcape/fortran/stdheight_2D_pressure_lev.f90 similarity index 100% rename from src/xcape/fortran/stdheight_2D_pressure_lev.f90 rename to xcape/fortran/stdheight_2D_pressure_lev.f90 diff --git a/src/xcape/fortran/stdheight_2D_pressure_lev.pyf b/xcape/fortran/stdheight_2D_pressure_lev.pyf similarity index 100% rename from src/xcape/fortran/stdheight_2D_pressure_lev.pyf rename to xcape/fortran/stdheight_2D_pressure_lev.pyf diff --git a/src/xcape/srh.py b/xcape/srh.py similarity index 100% rename from src/xcape/srh.py rename to xcape/srh.py diff --git a/src/xcape/stdheight.py b/xcape/stdheight.py similarity index 100% rename from src/xcape/stdheight.py rename to xcape/stdheight.py diff --git a/src/xcape/xarray.py b/xcape/xarray.py similarity index 100% rename from src/xcape/xarray.py rename to xcape/xarray.py From eef5030d7afbb6b870dd06b0fbf3989c995c8873 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jun 2024 15:12:21 +0200 Subject: [PATCH 2/7] run GHA on main only --- .github/workflows/tests.yml | 2 +- xcape/core.py | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 573c896..41b3091 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Full Tests on: pull_request: push: - # branches: [main] + branches: [main] jobs: run: diff --git a/xcape/core.py b/xcape/core.py index a7c3ad5..fe7bfa3 100644 --- a/xcape/core.py +++ b/xcape/core.py @@ -239,12 +239,8 @@ def _calc_cape_gufunc(*args, **kwargs): over the grid. ''' - if (kwargs['vertical_lev']=='sigma'): - signature = "(i),(i),(i),(),(),()->(),()" - output_dtypes = ('f4','f4') - elif (kwargs['vertical_lev']=='pressure'): - signature = "(i),(i),(i),(),(),(),()->(),()" - output_dtypes = ('f4','f4') + signature = "(i),(i),(i),(),(),()->(),()" + output_dtypes = ('f4','f4') if kwargs['source']=='most-unstable': signature += ",(),()" @@ -451,12 +447,8 @@ def _calc_srh_gufunc(*args, **kwargs): over the grid. ''' - if (kwargs['vertical_lev']=='sigma'): - signature = "(i),(i),(i),(i),(i),(),(),(),(),()->(),()" - output_dtypes = ('f4','f4') - elif (kwargs['vertical_lev']=='pressure'): - signature = "(i),(i),(i),(i),(i),(),(),(),(),(),()->(),()" - output_dtypes = ('f4','f4') + signature = "(i),(i),(i),(i),(i),(),(),(),(),()->(),()" + output_dtypes = ('f4','f4') if kwargs['output_var']=='all': signature += ",(),(),(),(),(),()" #",(2),(2),(2)" output_dtypes = output_dtypes + ('f4','f4','f4','f4','f4','f4') #('f4','f4','f4') From 1d0c472ae3e0a3855509c7dad25a37d68b6000e1 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jun 2024 15:20:18 +0200 Subject: [PATCH 3/7] try Windows and macOS too --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 41b3091..623499a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: python-version: [ "3.9", "3.10", "3.11", "3.12" ] - os: [ubuntu-latest] + os: [windows-latest, ubuntu-latest, macos-latest] fail-fast: false steps: From 8494e76022e8cfb69cf6f440a37a725176ce8e8e Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jun 2024 15:26:34 +0200 Subject: [PATCH 4/7] split gha --- .github/workflows/tests.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 623499a..6bc0baf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,6 +13,9 @@ jobs: python-version: [ "3.9", "3.10", "3.11", "3.12" ] os: [windows-latest, ubuntu-latest, macos-latest] fail-fast: false + defaults: + run: + shell: bash -l {0} steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 @@ -25,11 +28,13 @@ jobs: create-args: >- python=${{ matrix.python-version }} pip python-build compilers --channel conda-forge - - name: Install wheel and run tests - shell: bash -l {0} + - name: Install wheel run: > - python -m pip install -e . --no-deps --force-reinstall - && python -m build --wheel . --outdir dist - && cp -r test/ dist/ - && cd dist && pip install pytest *.whl + python -m build --wheel . --outdir dist + && pip install pytest dist/*.whl + + - name: Tests + run: > + cp -R test/ dist/ + && pushd dist/ && python -m pytest -rxs test From 595b52ef47fd29846fabdbfbed0699c944e96928 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jun 2024 18:13:32 +0200 Subject: [PATCH 5/7] maybe this will make macOS happy? --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6bc0baf..f6fde94 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,6 +35,6 @@ jobs: - name: Tests run: > - cp -R test/ dist/ + cp -R test/ dist/test/ && pushd dist/ && python -m pytest -rxs test From c07536337770738afeaafed470fc9c0621d0a597 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Wed, 26 Jun 2024 18:19:11 +0200 Subject: [PATCH 6/7] fix test badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a462e4e..a8157f6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Fast convective parameters for numpy, dask, and xarray [![pypi package](https://badge.fury.io/py/xcape.svg)](https://badge.fury.io/py/xcape) [![conda forge](https://anaconda.org/conda-forge/xcape/badges/version.svg)](https://anaconda.org/conda-forge/xcape) - +[![Full Tests](https://github.com/xgcm/xcape/actions/workflows/tests.yml/badge.svg)](https://github.com/xgcm/xcape/actions/workflows/tests.yml) [![code coverage](https://codecov.io/github/xgcm/xcape/coverage.svg?branch=master)](https://codecov.io/github/xgcm/xcape?branch=master) [![documentation status](https://readthedocs.org/projects/xcape/badge/?version=latest)](http://xcape.readthedocs.org/en/stable/?badge=latest) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/xgcm/xcape) From 4370fe356d3e8cdcbd3e6e4c3b15f65ef92bd9ab Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Mon, 1 Jul 2024 20:43:46 +0200 Subject: [PATCH 7/7] simplify meson file --- meson.build | 174 ++++++++++------------------------------------------ 1 file changed, 31 insertions(+), 143 deletions(-) diff --git a/meson.build b/meson.build index 2af984e..9b9e60e 100644 --- a/meson.build +++ b/meson.build @@ -9,158 +9,46 @@ project( py = import('python').find_installation(pure: false) py_dep = py.dependency() -# NumPy include directory - needed in all submodules -incdir_numpy = run_command(py, - [ - '-c', - 'import os; os.chdir(".."); import numpy; print(numpy.get_include())' - ], - check: true -).stdout().strip() +numpy_include_dir = run_command(py, ['-c', 'import numpy; print(numpy.get_include())'], check: true).stdout().strip() +f2py_include_dir = run_command(py, ['-c', 'import numpy.f2py; print(numpy.f2py.get_include())'], check: true).stdout().strip() +inc_np = include_directories(numpy_include_dir, f2py_include_dir) -inc_np = include_directories(incdir_numpy) - -incdir_f2py = incdir_numpy / '..' / '..' / 'f2py' / 'src' -inc_f2py = include_directories(incdir_f2py) -fortranobject_c = incdir_f2py / 'fortranobject.c' - - -CAPE_CODE_model_lev = custom_target( - 'CAPE_CODE_model_lev', - input: ['xcape/fortran/CAPE_CODE_model_lev.pyf', 'xcape/fortran/CAPE_CODE_model_lev.f90'], - output: ['CAPE_CODE_model_levmodule.c', 'CAPE_CODE_model_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'CAPE_CODE_model_lev', '--lower'], -) - -py.extension_module( +modules = [ 'CAPE_CODE_model_lev', - ['xcape/fortran/CAPE_CODE_model_lev.f90', CAPE_CODE_model_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -CAPE_CODE_pressure_lev = custom_target( - 'CAPE_CODE_pressure_lev', - input: ['xcape/fortran/CAPE_CODE_pressure_lev.pyf', 'xcape/fortran/CAPE_CODE_pressure_lev.f90'], - output: ['CAPE_CODE_pressure_levmodule.c', 'CAPE_CODE_pressure_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'CAPE_CODE_pressure_lev', '--lower'], -) - -py.extension_module( 'CAPE_CODE_pressure_lev', - ['xcape/fortran/CAPE_CODE_pressure_lev.f90', CAPE_CODE_pressure_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -Bunkers_model_lev = custom_target( - 'Bunkers_model_lev', - input: ['xcape/fortran/Bunkers_model_lev.pyf', 'xcape/fortran/Bunkers_model_lev.f90'], - output: ['Bunkers_model_levmodule.c', 'Bunkers_model_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'Bunkers_model_lev', '--lower'], -) - -py.extension_module( 'Bunkers_model_lev', - ['xcape/fortran/Bunkers_model_lev.f90', Bunkers_model_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -Bunkers_pressure_lev = custom_target( 'Bunkers_pressure_lev', - input: ['xcape/fortran/Bunkers_pressure_lev.pyf', 'xcape/fortran/Bunkers_pressure_lev.f90'], - output: ['Bunkers_pressure_levmodule.c', 'Bunkers_pressure_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'Bunkers_pressure_lev', '--lower'], -) - -py.extension_module( - 'Bunkers_pressure_lev', - ['xcape/fortran/Bunkers_pressure_lev.f90', Bunkers_pressure_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -SREH_model_lev = custom_target( - 'SREH_model_lev', - input: ['xcape/fortran/SREH_model_lev.pyf', 'xcape/fortran/SREH_model_lev.f90'], - output: ['SREH_model_levmodule.c', 'SREH_model_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'SREH_model_lev', '--lower'], -) - -py.extension_module( 'SREH_model_lev', - ['xcape/fortran/SREH_model_lev.f90', SREH_model_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -SREH_pressure_lev = custom_target( 'SREH_pressure_lev', - input: ['xcape/fortran/SREH_pressure_lev.pyf', 'xcape/fortran/SREH_pressure_lev.f90'], - output: ['SREH_pressure_levmodule.c', 'SREH_pressure_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'SREH_pressure_lev', '--lower'], -) - -py.extension_module( - 'SREH_pressure_lev', - ['xcape/fortran/SREH_pressure_lev.f90', SREH_pressure_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -stdheight_2D_model_lev = custom_target( 'stdheight_2D_model_lev', - input: ['xcape/fortran/stdheight_2D_model_lev.pyf', 'xcape/fortran/stdheight_2D_model_lev.f90'], - output: ['stdheight_2D_model_levmodule.c', 'stdheight_2D_model_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'stdheight_2D_model_lev', '--lower'], -) - -py.extension_module( - 'stdheight_2D_model_lev', - ['xcape/fortran/stdheight_2D_model_lev.f90', stdheight_2D_model_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - -stdheight_2D_pressure_lev = custom_target( 'stdheight_2D_pressure_lev', - input: ['xcape/fortran/stdheight_2D_pressure_lev.pyf', 'xcape/fortran/stdheight_2D_pressure_lev.f90'], - output: ['stdheight_2D_pressure_levmodule.c', 'stdheight_2D_pressure_lev-f2pywrappers.f'], - command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', 'stdheight_2D_pressure_lev', '--lower'], -) - -py.extension_module( - 'stdheight_2D_pressure_lev', - ['xcape/fortran/stdheight_2D_pressure_lev.f90', stdheight_2D_pressure_lev], - fortranobject_c, - include_directories: [inc_np, inc_f2py], - dependencies: [py_dep], - install : true, - subdir: 'xcape/fortran', -) - +] + +foreach MOD : modules + _module = custom_target(f'@MOD@', + input: [ + f'xcape/fortran/@MOD@.pyf', + f'xcape/fortran/@MOD@.f90' + ], + output: [ + f'@MOD@module.c', + f'@MOD@-f2pywrappers.f' + ], + command : [py, '-m', 'numpy.f2py', '@INPUT@', '-m', f'@MOD@', '--lower'], + ) + + py.extension_module(f'@MOD@', + [ + f'xcape/fortran/@MOD@.f90', + _module, + f2py_include_dir / 'fortranobject.c', + ], + include_directories: inc_np, + dependencies: [py_dep], + install : true, + subdir: 'xcape/fortran', + ) +endforeach py.install_sources( 'xcape/__init__.py',