From 2b40e0a21e681c35f9b5e2f002e22566b428b371 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 13:37:13 +0100 Subject: [PATCH 01/11] use floodestimation=0.4.2 --- conda-recipe/.binstar.yml | 2 +- conda-recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda-recipe/.binstar.yml b/conda-recipe/.binstar.yml index 0117f27..dc245e3 100644 --- a/conda-recipe/.binstar.yml +++ b/conda-recipe/.binstar.yml @@ -11,7 +11,7 @@ engine: before_script: - conda update --name=root conda conda-build - - conda config --add channels https://conda.binstar.org/openhydrology + - conda config --add channels https://conda.anaconda.org/openhydrology script: - conda build . \ No newline at end of file diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 01e0891..6ccca20 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -18,13 +18,13 @@ requirements: - setuptools - appdirs 1.4* - jinja2 2.7* - - floodestimation 0.4.0 + - floodestimation 0.4.2 run: - python - appdirs 1.4* - jinja2 2.7* - - floodestimation 0.4.0 + - floodestimation 0.4.2 test: # Python imports From 5c1b1beffa3c43c989272339afda0b30c0c55f01 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 13:37:53 +0100 Subject: [PATCH 02/11] updated test reports --- ...002.Flood estimation report.2015-08-26.md} | 40 +++++++++---------- ...017.Flood estimation report.2015-08-26.md} | 18 ++++----- 2 files changed, 29 insertions(+), 29 deletions(-) rename autostatistical/tests/data/{17002.Flood estimation report.2015-02-25.md => 17002.Flood estimation report.2015-08-26.md} (85%) rename autostatistical/tests/data/{37017.Flood estimation report.2015-02-25.md => 37017.Flood estimation report.2015-08-26.md} (93%) diff --git a/autostatistical/tests/data/17002.Flood estimation report.2015-02-25.md b/autostatistical/tests/data/17002.Flood estimation report.2015-08-26.md similarity index 85% rename from autostatistical/tests/data/17002.Flood estimation report.2015-02-25.md rename to autostatistical/tests/data/17002.Flood estimation report.2015-08-26.md index 7bc3c87..c1bd08c 100644 --- a/autostatistical/tests/data/17002.Flood estimation report.2015-02-25.md +++ b/autostatistical/tests/data/17002.Flood estimation report.2015-08-26.md @@ -1,6 +1,6 @@ # Flood Estimation Report -Date: 25/02/2015 +Date: 26/08/2015 ## Input data @@ -26,10 +26,10 @@ FARL | 0.824  | SAAR4170 | 951      | | ### National River Flow Archive (NRFA) data -Source: http://www.ceh.ac.uk/data/nrfa/peak_flow/WINFAP-FEH_v3.3.4.zip +Source: http://nrfaapps.ceh.ac.uk/peak_flow/WINFAP-FEH_v3.3.4.zip Version: 3.3.4 Published: August 2014 -Retrieved: 24/02/2015 +Retrieved: 26/08/2015 ## Median annual flood (QMED) @@ -66,29 +66,29 @@ Analysis type: Pooled catchments analysis (ungauged) Donor river | Donor location | Sim. dist. | Rec. length | L-var. | Weight | L-skew | Weight :-------------------|:-------------------------------|-----------:|------------:|-------:|-------:|-------:|------: -Thurso | Halkirk | 0.33 | 35 | 0.173 | 0.100 | 0.102 | 0.086 -Brora | Bruachrobie | 0.71 | 14 | 0.149 | 0.065 | 0.101 | 0.049 -Helmsdale | Kilphedir | 0.75 | 32 | 0.119 | 0.076 | 0.117 | 0.071 -Naver | Apigill | 0.82 | 28 | 0.169 | 0.072 | 0.126 | 0.067 -Nairn | Firhall | 0.85 | 25 | 0.312 | 0.070 | 0.325 | 0.064 +Thurso | Halkirk | 0.33 | 34 | 0.173 | 0.100 | 0.102 | 0.086 +Brora | Bruachrobie | 0.71 | 13 | 0.149 | 0.063 | 0.101 | 0.047 +Helmsdale | Kilphedir | 0.75 | 31 | 0.119 | 0.076 | 0.117 | 0.071 +Naver | Apigill | 0.82 | 28 | 0.169 | 0.073 | 0.126 | 0.068 +Nairn | Firhall | 0.85 | 25 | 0.312 | 0.071 | 0.325 | 0.065 Windrush | Newbridge | 0.99 | 62 | 0.194 | 0.074 | 0.241 | 0.082 -Isla | Wester Cardean | 1.00 | 23 | 0.154 | 0.066 | 0.077 | 0.062 -Itchen | Highbridge & Allbrook Total | 1.05 | 54 | 0.146 | 0.071 | 0.138 | 0.079 -Lugg | Butts Bridge | 1.09 | 41 | 0.162 | 0.069 | 0.046 | 0.074 -Derwent | Chatsworth | 1.11 | 37 | 0.248 | 0.068 | 0.211 | 0.072 -Wreake | Syston Mill | 1.13 | 43 | 0.307 | 0.068 | 0.393 | 0.075 +Isla | Wester Cardean | 1.00 | 22 | 0.154 | 0.065 | 0.077 | 0.061 +Itchen | Highbridge & Allbrook Total | 1.05 | 54 | 0.146 | 0.072 | 0.138 | 0.080 +Lugg | Butts Bridge | 1.09 | 41 | 0.162 | 0.069 | 0.046 | 0.075 +Derwent | Chatsworth | 1.11 | 37 | 0.248 | 0.068 | 0.211 | 0.073 +Wreake | Syston Mill | 1.13 | 42 | 0.307 | 0.068 | 0.393 | 0.075 Evenlode | Cassington Mill | 1.14 | 42 | 0.225 | 0.068 | 0.133 | 0.075 Irvine | Shewalton | 1.14 | 30 | 0.143 | 0.065 | 0.206 | 0.068 -Wylye | South Newton | 1.14 | 41 | 0.254 | 0.068 | 0.137 | 0.074 -Total/weighted avg. | | | 507 | 0.196 | 1.000 | 0.169 | 1.000 +Wylye | South Newton | 1.14 | 41 | 0.254 | 0.068 | 0.137 | 0.075 +Total/weighted avg. | | | 502 | 0.196 | 1.000 | 0.169 | 1.000 -L-var., urban: 0.191 -L-skew, urban: 0.175 +L-var., urban: 0.192 +L-skew, urban: 0.176 ### Flood frequency curve Distribution: GLO -Parameters: 1.000, 0.182, -0.175 +Parameters: 1.000, 0.182, -0.176 AEP (%) | Growth factor | Flow (m³/s) -------:|--------------:|-----------: @@ -96,10 +96,10 @@ AEP (%) | Growth factor | Flow (m³/s) 20.0 | 1.29 | 67   10.0 | 1.49 | 77   5.0 | 1.70 | 88   - 3.3 | 1.83 | 95   + 3.3 | 1.84 | 95   2.0 | 2.02 | 100   1.3 | 2.17 | 110   - 1.0 | 2.28 | 120   + 1.0 | 2.29 | 120   0.5 | 2.59 | 130   0.2 | 3.05 | 160   0.1 | 3.45 | 180   diff --git a/autostatistical/tests/data/37017.Flood estimation report.2015-02-25.md b/autostatistical/tests/data/37017.Flood estimation report.2015-08-26.md similarity index 93% rename from autostatistical/tests/data/37017.Flood estimation report.2015-02-25.md rename to autostatistical/tests/data/37017.Flood estimation report.2015-08-26.md index 7ad9d80..3c00f4a 100644 --- a/autostatistical/tests/data/37017.Flood estimation report.2015-02-25.md +++ b/autostatistical/tests/data/37017.Flood estimation report.2015-08-26.md @@ -1,6 +1,6 @@ # Flood Estimation Report -Date: 25/02/2015 +Date: 26/08/2015 ## Input data @@ -65,10 +65,10 @@ FARL | 0.994  | SAAR4170 | 604      | | ### National River Flow Archive (NRFA) data -Source: http://www.ceh.ac.uk/data/nrfa/peak_flow/WINFAP-FEH_v3.3.4.zip +Source: http://nrfaapps.ceh.ac.uk/peak_flow/WINFAP-FEH_v3.3.4.zip Version: 3.3.4 Published: August 2014 -Retrieved: 24/02/2015 +Retrieved: 26/08/2015 ## Median annual flood (QMED) @@ -87,17 +87,17 @@ Donor river | Donor location | Sim. dist. | Rec. length :-------------------|:-------------------------------|-----------:|------------:|-------:|-------:|-------:|------: Blackwater | Stisted | 0.00 | 34 | 0.223 | 0.663 | -0.091 | 0.188 Chelmer | Felsted | 0.12 | 42 | 0.332 | 0.040 | 0.216 | 0.105 -Brett | Hadleigh | 0.17 | 48 | 0.298 | 0.037 | 0.153 | 0.094 +Brett | Hadleigh | 0.17 | 48 | 0.298 | 0.038 | 0.153 | 0.094 Cam | Chesterford | 0.20 | 43 | 0.248 | 0.035 | -0.108 | 0.084 Rib | Wadesmill | 0.23 | 53 | 0.313 | 0.035 | 0.163 | 0.085 -Tove | Cappenham Bridge | 0.28 | 49 | 0.270 | 0.033 | 0.183 | 0.077 -Gipping | Stowmarket | 0.36 | 48 | 0.296 | 0.030 | 0.108 | 0.069 -Tyne | Spilmersford | 0.54 | 45 | 0.406 | 0.026 | 0.245 | 0.062 +Tove | Cappenham Bridge | 0.28 | 48 | 0.270 | 0.033 | 0.183 | 0.076 +Gipping | Stowmarket | 0.36 | 46 | 0.296 | 0.030 | 0.108 | 0.069 +Tyne | Spilmersford | 0.54 | 44 | 0.406 | 0.026 | 0.245 | 0.061 Blackadder Water | Mouth Bridge | 0.57 | 32 | 0.321 | 0.025 | 0.268 | 0.055 Bourne | Laverstock | 0.60 | 41 | 0.323 | 0.025 | 0.302 | 0.059 Enborne | Brimpton | 0.60 | 45 | 0.204 | 0.025 | 0.148 | 0.061 -Bain | Fulsby Lock | 0.61 | 50 | 0.294 | 0.025 | 0.087 | 0.062 -Total/weighted avg. | | | 530 | 0.249 | 1.000 | 0.109 | 1.000 +Bain | Fulsby Lock | 0.61 | 50 | 0.294 | 0.026 | 0.087 | 0.062 +Total/weighted avg. | | | 526 | 0.249 | 1.000 | 0.108 | 1.000 L-var., urban: 0.245 L-skew, urban: 0.113 From bb620ff5161f00d8f0d6954aefe380715040ae20 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 13:38:34 +0100 Subject: [PATCH 03/11] replace binstar.org by anaconda.org --- docs/source/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/installation.rst b/docs/source/installation.rst index d03a641..8de9b6c 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -34,12 +34,12 @@ Mac OS and Linux OH Auto Statistical can be installed on Mac OS and Linux operating systems from binstar.org using the `Conda package manager `_: - .. image:: https://binstar.org/openhydrology/autostatistical/badges/version.svg - :target: https://binstar.org/openhydrology/autostatistical + .. image:: https://anaconda.org/openhydrology/autostatistical/badges/version.svg + :target: https://anaconda.org/openhydrology/autostatistical .. code-block:: shell - conda install -c https://conda.binstar.org/openhydrology autostatistical + conda install -c https://conda.anaconda.org/openhydrology autostatistical Or alternatively directly from the source code: From 2694fd4e5c951d0daec560b1622e803e9a77871d Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 13:54:11 +0100 Subject: [PATCH 04/11] jinja version update --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 6ccca20..12acd32 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -17,13 +17,13 @@ requirements: - python - setuptools - appdirs 1.4* - - jinja2 2.7* + - jinja2 2.8* - floodestimation 0.4.2 run: - python - appdirs 1.4* - - jinja2 2.7* + - jinja2 2.8* - floodestimation 0.4.2 test: From be21b4ddedc25183a71bd2189a77a5b9133ed892 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 13:54:50 +0100 Subject: [PATCH 05/11] replace binstar.org with anaconda.org --- docs/source/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 8de9b6c..0960a91 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -31,7 +31,7 @@ interfere with any existing Python installation. Mac OS and Linux ---------------- -OH Auto Statistical can be installed on Mac OS and Linux operating systems from binstar.org using the `Conda package +OH Auto Statistical can be installed on Mac OS and Linux operating systems from anaconda.org using the `Conda package manager `_: .. image:: https://anaconda.org/openhydrology/autostatistical/badges/version.svg From 36e50dfe4d6f3c79cc59532e53f77ccd671351fb Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 13:55:07 +0100 Subject: [PATCH 06/11] doc conf updates --- docs/source/conf.py | 257 ++------------------------------------------ 1 file changed, 11 insertions(+), 246 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index e0da74a..f878154 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,277 +1,42 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- -# -# OH Auto Statistical documentation build configuration file, created by -# sphinx-quickstart on Tue Dec 9 20:36:57 2014. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. import sys import os from datetime import date -from unittest.mock import MagicMock -# Mock packages that cannot (or we dont need to) be installed on readthedocs.org. -class Mock(MagicMock): - @classmethod - def __getattr__(cls, name): - return Mock() - -MOCK_MODULES = ['numpy', 'scipy', 'scipy.misc', 'scipy.stats', 'scipy.stats._continuous_distns', 'scipy.special'] -sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES) - - -# 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 -# documentation root, use os.path.abspath to make it absolute, like shown here. +autodoc_mock_imports = [ + 'numpy', + 'scipy', 'scipy.misc', 'scipy.stats', 'scipy.stats._continuous_distns', 'scipy.special' +] sys.path.insert(0, os.path.abspath('../..')) sys.path.insert(0, os.path.abspath('../../autostatistical')) # -- General configuration ------------------------------------------------ -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. +needs_sphinx = '1.3' extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.doctest', ] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. master_doc = 'index' - -# General information about the project. project = 'OH Auto Statistical' copyright = '2014‒{}, Open Hydrology contributors'.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 -# built documents. -# -# The short X.Y version. full_version = open('../../VERSION').read().split('-')[0] # Ignore build number version = '.'.join(full_version.split('.')[0:2]) -# The full version, including alpha/beta/rc tags. release = full_version - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = [] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - - # -- Options for HTML output ---------------------------------------------- -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'default' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +on_rtd = os.environ.get('READTHEDOCS', None) == 'True' +if not on_rtd: # only import and set the theme if we're building docs locally + import sphinx_rtd_theme + html_theme = 'sphinx_rtd_theme' + html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. html_last_updated_fmt = '%d/%m/%Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -html_show_sourcelink = False - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. html_show_sphinx = False - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'OHAutoStatisticaldoc' - - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'OHAutoStatistical.tex', 'OH Auto Statistical Documentation', - 'Florenz A. P. Hollebrandse', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'ohautostatistical', 'OH Auto Statistical Documentation', - ['Florenz A. P. Hollebrandse'], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'OHAutoStatistical', 'OH Auto Statistical Documentation', - 'Florenz A. P. Hollebrandse', 'OHAutoStatistical', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False +htmlhelp_basename = 'doc' From d69eda17bfbd2e9c2ed9c82b77f54d43094679dd Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 15:11:01 +0100 Subject: [PATCH 07/11] add anaconda app info --- conda-recipe/meta.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 12acd32..669973f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -31,6 +31,13 @@ test: imports: - autostatistical +app: + entry: autostatistical + type: desk + icon: + own_environment: true + summary: Fully automated flood estimation for UK catchments + about: home: https://github.com/OpenHydrology/OH-Auto-Statistical license: GPLv3 From 0ca213f503eff9443ca93115bc7f5124beb94521 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 19:24:50 +0100 Subject: [PATCH 08/11] new miniconda version --- installer/win/installer.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/win/installer.nsi b/installer/win/installer.nsi index fecabd6..568e60e 100644 --- a/installer/win/installer.nsi +++ b/installer/win/installer.nsi @@ -35,7 +35,7 @@ !define HELP_URL "http://docs.open-hydrology.org" !define PACKAGE_NAME "autostatistical" ; !define CONDA_CHANNEL "https://conda.binstar.org/openhydrology" ; should be set by `makensis` argument -!define CONDA_URL "http://repo.continuum.io/miniconda/Miniconda3-3.9.1-Windows-x86_64.exe" +!define CONDA_URL "http://repo.continuum.io/miniconda/Miniconda3-3.16.0-Windows-x86_64.exe" ; Interface settings !define MUI_WELCOMEPAGE_TITLE "${APP_NAME} ${VERSION} setup" From 686db44ad2ce0c9601160b63fc4bb5107ce2c2f2 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 19:27:37 +0100 Subject: [PATCH 09/11] conda channel to anaconda.org --- binst.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binst.py b/binst.py index a0a42fd..d91a0f8 100644 --- a/binst.py +++ b/binst.py @@ -13,7 +13,7 @@ # Parse version and build number from VERSION file full_version = open('VERSION').read().split('-') version = full_version[0] -conda_channel = 'https://conda.binstar.org/openhydrology' +conda_channel = 'https://conda.anaconda.org/openhydrology' if len(full_version) == 1: # Public release version number = 0 From 2f48ac6a6d94ce6a23e4983b8ad09de0d1159667 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 19:44:00 +0100 Subject: [PATCH 10/11] changelog --- CHANGELOG.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2ccdd01..790f54e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +version 0.5.5 (2015-08-26) +-------------------------- +- Upgrade to floodestimation library v0.4.2 +- Upgrade various other dependencies + version 0.5.3 (2015-02-27) -------------------------- - Use version 3.9.1 of miniconda in win installer From d56b199d70740af943a3f221dc2450e089eea133 Mon Sep 17 00:00:00 2001 From: "Florenz A. P. Hollebrandse" Date: Wed, 26 Aug 2015 20:00:07 +0100 Subject: [PATCH 11/11] travis conf update --- .travis.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa79725..4f28083 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,24 @@ language: python python: -- 3.3 -- 3.4 + - 3.3 + - 3.4 + +sudo: false before_install: -- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh -- chmod +x miniconda.sh -- ./miniconda.sh -b -- export PATH=/home/travis/miniconda/bin:$PATH -- conda update --yes conda -- conda config --add channels https://conda.binstar.org/openhydrology -# The next couple lines fix a crash with multiprocessing on Travis and are not specific to using Miniconda -- sudo rm -rf /dev/shm -- sudo ln -s /run/shm /dev/shm + - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh + - 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 + - conda config --add channels http://conda.anaconda.org/openhydrology + - conda create -q -n pyenv python=$TRAVIS_PYTHON_VERSION nose appdirs=1.4 Jinja2=2.8 floodestimation=0.4.2 + - source activate pyenv install: -- conda install --yes python=$TRAVIS_PYTHON_VERSION nose appdirs=1.4 Jinja2=2.7 floodestimation=0.4.0 -- python setup.py install + - python setup.py install script: -- nosetests + - nosetests