Merge branch 'feature_conda'

Author: faph

CHANGELOG.txt

@@ -1,3 +1,7 @@
+version 1.0.2 (2015-02-11)
+--------------------------
+- Conda package build fix
+
 version 1.0.1 (2014-12-02)
 --------------------------
 - Fix `lmom_fit` for `gev` distribution. Did not return `OrderedDict` in some cases.

bump_version.py

@@ -9,7 +9,7 @@
 """One of the following arguments must be supplied:
 - 'major': to increase major version number, e.g. from 1.2.3 to 2.0.0
 - 'minor': to increase minor version number, e.g. from 1.2.3 to 1.3.0
-- 'patch': to increase patch number, e..g from 1.2.3 to 1.2.4"""
+- 'patch': to increase patch number, e.g. from 1.2.3 to 1.2.4"""
 
 LEVELS = ['major', 'minor', 'patch']
 
@@ -60,7 +60,7 @@ def update_package_setup(new_version):
     file_name= 'setup.py'
 
     new_content = []
-    with open(file_name) as f:
+    with open(file_name, encoding='utf-8') as f:
         for line in f:
             if line.strip().startswith('version'):
                 line = "    version='{}.{}.{}',\n".format(*new_version)
@@ -73,7 +73,7 @@ def update_doc_conf(new_version):
     file_name = './docs/source/conf.py'
 
     new_content = []
-    with open(file_name) as f:
+    with open(file_name, encoding='utf-8') as f:
         for line in f:
             if line.strip().startswith('version'):
                 line = "version = '{}.{}'\n".format(*new_version[0:2])
@@ -89,7 +89,7 @@ def update_changelog(new_version):
 
     header = 'version {}.{}.{} ({})'.format(new_version[0], new_version[1], new_version[2], date.today())
     new_content = [header + '\n', '-' * len(header) + '\n']
-    with open(file_name) as f:
+    with open(file_name, encoding='utf-8') as f:
         for line in f:
             new_content.append(line)
 

conda-recipe/bld.bat

@@ -0,0 +1,2 @@
+python setup.py install
+if errorlevel 1 exit 1

conda-recipe/build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PYTHON setup.py install || exit 1

conda-recipe/meta.yaml

@@ -0,0 +1,31 @@
+package:
+  name: lmoments3
+  version: {{ environ.get('GIT_DESCRIBE_TAG', '0.0.0')[1:] }}
+
+build:
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  
+source:
+  git_url: ..
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - numpy 1.9*
+    - scipy >=0.14
+
+  run:
+    - python
+    - numpy 1.9*
+    - scipy >=0.14
+
+test:
+  imports:
+    - lmoments3
+
+about:
+  home: http://github.com/OpenHydrology/lmoments3
+  license: GPLv3
+  summary: Python library for estimating linear moments for statistical distributions
+

docs/source/conf.py

@@ -15,6 +15,7 @@
 
 import sys
 import os
+from datetime import date
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -33,6 +34,7 @@
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
+    'sphinx.ext.viewcode'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -49,7 +51,7 @@
 
 # General information about the project.
 project = 'lmoments3 Library'
-copyright = '2014, Florenz A. P. Hollebrandse, Sam Gillespie, William Asquith, J. R. M. Hosking'
+copyright = '2014‒{}, Florenz A. P. Hollebrandse, Sam Gillespie, William Asquith, J. R. M. Hosking'.format(date.today().year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -58,7 +60,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.1'
+release = '1.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -141,7 +143,7 @@
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%d/%m/%Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -164,10 +166,10 @@
 #html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+html_show_sphinx = False
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 #html_show_copyright = True

setup.py

@@ -1,36 +1,9 @@
 from setuptools import setup
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-# Get the long description from the relevant file
-with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
 
 setup(
     name='lmoments3',
-    version='1.0.1',
+    version='1.0.2',
     packages=['lmoments3'],
-    url='https://github.com/OpenHydrology/lmoments3',
-    license='GPLv3',
-    author='Florenz A. P. Hollebrandse, Sam Gillespie, William Asquith, J. R. M. Hosking',
-    author_email='f.a.p.hollebrandse@protonmail.ch',
-    description='Estimate linear moments for statistical distribution functions',
-    long_description=long_description,
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Other Environment",
-        "Intended Audience :: Education",
-        "Intended Audience :: End Users/Desktop",
-        "Intended Audience :: Science/Research",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Operating System :: OS Independent",
-        "Topic :: Scientific/Engineering",
-        "Topic :: Scientific/Engineering :: Information Analysis",
-        "Topic :: Scientific/Engineering :: Physics",
-        "Topic :: Scientific/Engineering :: Mathematics",
-        "Topic :: Software Development :: Libraries :: Python Modules"
-    ],
     install_requires=[
         'numpy',
         'scipy'