Changeset cc4987a


Ignore:
Timestamp:
Mar 24, 2017, 4:22:42 AM (3 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, sampler
Children:
0561c54
Parents:
6448d31 (diff), 115b452 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'gitshaversion'

Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r6448d31 rcc4987a  
    3939python/*.wav
    4040
     41pip-delete-this-directory.txt
     42
    4143aubio-*.tar.bz2
    4244aubio-*.zip
     45dist/*.tar.gz
    4346
    4447# test sounds
  • MANIFEST.in

    r6448d31 rcc4987a  
    11include AUTHORS COPYING README.md VERSION ChangeLog
    22include python/README.md
     3include this_version.py
    34include Makefile wscript */wscript_build
    45include waf waflib/* waflib/*/*
  • README.md

    r6448d31 rcc4987a  
    11aubio library
    22=============
     3[![Travis build status](https://travis-ci.org/aubio/aubio.svg?branch=master)](https://travis-ci.org/aubio/aubio "Travis build status")
     4[![Appveyor build status](https://ci.appveyor.com/api/projects/status/f3lhy3a57rkgn5yi?svg=true)](https://ci.appveyor.com/project/aubio/aubio/branch/master "Appveyor build status")
     5[![Landscape code health](https://landscape.io/github/aubio/aubio/master/landscape.svg?style=flat)](https://landscape.io/github/aubio/aubio/master "Landscape code health")
     6[![Documentation Status](https://readthedocs.org/projects/aubio/badge/?version=latest)](http://aubio.readthedocs.io/en/latest/?badge=latest "Documentation status")
     7[![Commits since last release](https://img.shields.io/github/commits-since/aubio/aubio/0.4.4.svg?maxAge=2592000)](https://github.com/aubio/aubio "Commits since last release")
    38
    49aubio is a library to label music and sounds. It listens to audio signals and
  • doc/conf.py

    r6448d31 rcc4987a  
    1313
    1414import sys, os
     15
     16# get version using this_version.py
     17sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
     18from this_version import get_aubio_version
    1519
    1620# If extensions (or modules to document with autodoc) are in another directory,
     
    4953#
    5054# The short X.Y version.
    51 version = '0.4'
     55
     56version = get_aubio_version()[:3]
    5257# The full version, including alpha/beta/rc tags.
    53 release = '0.4.5~alpha'
     58release = get_aubio_version()
    5459
    5560# The language for content autogenerated by Sphinx. Refer to documentation
  • python/lib/moresetuptools.py

    r6448d31 rcc4987a  
    55from .gen_external import generate_external, header, output_path
    66
    7 def get_aubio_version():
    8     # read from VERSION
    9     this_file_dir = os.path.dirname(os.path.abspath(__file__))
    10     version_file = os.path.join(this_file_dir, '..', '..', 'VERSION')
    11 
    12     if not os.path.isfile(version_file):
    13         raise SystemError("VERSION file not found.")
    14 
    15     for l in open(version_file).readlines():
    16         #exec (l.strip())
    17         if l.startswith('AUBIO_MAJOR_VERSION'):
    18             AUBIO_MAJOR_VERSION = int(l.split('=')[1])
    19         if l.startswith('AUBIO_MINOR_VERSION'):
    20             AUBIO_MINOR_VERSION = int(l.split('=')[1])
    21         if l.startswith('AUBIO_PATCH_VERSION'):
    22             AUBIO_PATCH_VERSION = int(l.split('=')[1])
    23         if l.startswith('AUBIO_VERSION_STATUS'):
    24             AUBIO_VERSION_STATUS = l.split('=')[1].strip()[1:-1]
    25 
    26     if AUBIO_MAJOR_VERSION is None or AUBIO_MINOR_VERSION is None \
    27             or AUBIO_PATCH_VERSION is None:
    28         raise SystemError("Failed parsing VERSION file.")
    29 
    30     verstr = '.'.join(map(str, [AUBIO_MAJOR_VERSION,
    31                                      AUBIO_MINOR_VERSION,
    32                                      AUBIO_PATCH_VERSION]))
    33 
    34     if AUBIO_VERSION_STATUS is not None:
    35         verstr += AUBIO_VERSION_STATUS
    36     return verstr
    37 
    38 def get_aubio_pyversion():
    39     # convert to version for python according to pep 440
    40     # see https://www.python.org/dev/peps/pep-0440/
    41     verstr = get_aubio_version()
    42     if '~alpha' in verstr:
    43         verstr = verstr.split('~')[0] + 'a1'
    44     # TODO: add rc, .dev, and .post suffixes, add numbering
    45     return verstr
     7from this_version import get_aubio_version
    468
    479# inspired from https://gist.github.com/abergmeier/9488990
     
    216178                add_local_aubio_sources(extension)
    217179        # generate files python/gen/*.c, python/gen/aubio-generated.h
     180        extension.include_dirs += [ output_path ]
    218181        extension.sources += generate_external(header, output_path, overwrite = False,
    219182                usedouble=enable_double)
  • setup.py

    r6448d31 rcc4987a  
    33import sys, os.path, glob
    44from setuptools import setup, Extension
    5 from python.lib.moresetuptools import *
     5from python.lib.moresetuptools import build_ext, CleanGenerated
    66# function to generate gen/*.{c,h}
    7 from python.lib.gen_external import generate_external, header, output_path
     7from this_version import get_aubio_version, get_aubio_pyversion
    88
    99__version__ = get_aubio_pyversion()
     10__aubio_version__ = get_aubio_version()
    1011
    1112include_dirs = []
    1213library_dirs = []
    13 define_macros = [('AUBIO_VERSION', '%s' % __version__)]
     14define_macros = [('AUBIO_VERSION', '%s' % __aubio_version__)]
    1415extra_link_args = []
    1516
    1617include_dirs += [ 'python/ext' ]
    17 include_dirs += [ output_path ] # aubio-generated.h
    1818try:
    1919    import numpy
  • wscript

    r6448d31 rcc4987a  
    1515APPNAME = 'aubio'
    1616
    17 # source VERSION
    18 for l in open('VERSION').readlines(): exec (l.strip())
    19 
    20 VERSION = '.'.join ([str(x) for x in [
    21     AUBIO_MAJOR_VERSION,
    22     AUBIO_MINOR_VERSION,
    23     AUBIO_PATCH_VERSION
    24     ]]) + AUBIO_VERSION_STATUS
    25 
    26 LIB_VERSION = '.'.join ([str(x) for x in [
    27     LIBAUBIO_LT_CUR,
    28     LIBAUBIO_LT_REV,
    29     LIBAUBIO_LT_AGE]])
     17from this_version import *
     18
     19VERSION = get_aubio_version()
     20LIB_VERSION = get_libaubio_version()
    3021
    3122top = '.'
Note: See TracChangeset for help on using the changeset viewer.