diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f99b080c143cc74960b5dac6043e54e38e9b5e..15985b8eb2a82b655f3b0dbd5d41d3c92463f090 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,8 +13,7 @@ build-and-test: - export EVALHYD_PYTHON_VENDOR_XTL=FALSE - export EVALHYD_PYTHON_VENDOR_XTENSOR=FALSE - export EVALHYD_PYTHON_VENDOR_XTENSOR_PYTHON=FALSE - # vendor evalhyd (while waiting for evalhyd to be uploaded to conda-forge) - - micromamba install --yes -c conda-forge git + # vendor evalhyd-cpp - export EVALHYD_PYTHON_VENDOR_EVALHYD_CPP=TRUE # print Python version - python --version diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000000000000000000000000000000000000..e2df79cc6db9ba0abee7f6121b04b95f6df9a7c1 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +recursive-include deps *.* diff --git a/changelog.rst b/changelog.rst index 32f869242fb5a558dbf23d41e8ec56014816bc48..22ccf3e400f8e8fe65c40aacf7262f40a4a797e2 100644 --- a/changelog.rst +++ b/changelog.rst @@ -6,6 +6,16 @@ Yet to be versioned and released. Only available from *dev* branch until then. +v0.1.1.0 +-------- + +Released on 2023-06-16. + +.. rubric:: Dependency changes + +* move to `evalhyd-cpp==0.1.1` + (`see changelog <https://hydrogr.github.io/evalhyd/cpp/changelog.html#v0-1-1>`_) + v0.1.0.0 -------- diff --git a/deps/evalhyd-cpp b/deps/evalhyd-cpp index 5fd5811b75a849351002569dc196ea55aab906e0..1d815c6808c61511864b38cee7d8b03be1187cb8 160000 --- a/deps/evalhyd-cpp +++ b/deps/evalhyd-cpp @@ -1 +1 @@ -Subproject commit 5fd5811b75a849351002569dc196ea55aab906e0 +Subproject commit 1d815c6808c61511864b38cee7d8b03be1187cb8 diff --git a/evalhyd/version.py b/evalhyd/version.py index 4f4f4229e6a5ee0683a3b13e34a2906e7538c79b..b52d80e26f84b062c2a19e801b9bcf746eb1e9cc 100644 --- a/evalhyd/version.py +++ b/evalhyd/version.py @@ -1,3 +1,3 @@ -__version__ = '0.1.0.0' +__version__ = '0.1.1.0' diff --git a/setup.py b/setup.py index 34a97c7e5b2df5e7caa9b448c8fb5c14ae84bac3..202fc0bb23813e7cc29e9ad74cfb30d463293148 100644 --- a/setup.py +++ b/setup.py @@ -44,9 +44,21 @@ setup( version=__version__, author='Thibault Hallouin', author_email='thibault.hallouin@inrae.fr', - url='https://gitlab.irstea.fr/hycar-hydro/evalhyd/evalhyd-python', + download_url="https://pypi.python.org/pypi/evalhyd-python", + project_urls={ + 'Bug Tracker': 'https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-python/-/issues', + 'Documentation': 'https://hydrogr.github.io/evalhyd/python', + 'Source Code': 'https://gitlab.irstea.fr/hycar-hydro/evalhyd/evalhyd-python', + }, description='Python bindings for EvalHyd', long_description='An evaluator for streamflow predictions.', + license="GPLv3", + classifiers=[ + 'Natural Language :: English', + 'Intended Audience :: Science/Research', + 'Topic :: Scientific/Engineering :: Hydrology', + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)' + ], packages=["evalhyd"], ext_modules=ext_modules, cmdclass={'build_ext': build_ext}, diff --git a/tests/expected/evalp/AWI.csv b/tests/expected/evalp/AWI.csv deleted file mode 100644 index 8b3b7e7f9598b23911dc06f440d71572b99b48e5..0000000000000000000000000000000000000000 --- a/tests/expected/evalp/AWI.csv +++ /dev/null @@ -1 +0,0 @@ -0.9821120161733,0.9880951944476 diff --git a/tests/expected/evalp/WSS.csv b/tests/expected/evalp/WSS.csv deleted file mode 100644 index fd929dabd8f58354be587455dcbd4402d6a9f83d..0000000000000000000000000000000000000000 --- a/tests/expected/evalp/WSS.csv +++ /dev/null @@ -1 +0,0 @@ -0.6621887740287,0.4360388849930 diff --git a/tests/test_probabilist.py b/tests/test_probabilist.py index c3adb76e0735535f7d240cd47e2566617fd84d8c..c47aaf29ebf8689d3695d9ff323c952f9af2c6af 100644 --- a/tests/test_probabilist.py +++ b/tests/test_probabilist.py @@ -24,7 +24,7 @@ _all_metrics = ( # ranks-based 'RANK_HIST', 'DS', 'AS', # intervals - 'CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS', + 'CR', 'AW', 'AWN', 'WS', # multivariate 'ES' ) @@ -82,7 +82,7 @@ class TestMetrics(unittest.TestCase): metric: ( numpy.genfromtxt(f"./expected/evalp/{metric}.csv", delimiter=',') [numpy.newaxis, numpy.newaxis, numpy.newaxis, numpy.newaxis, ...] - ) for metric in ('CR', 'AW', 'AWN', 'AWI', 'WS', 'WSS') + ) for metric in ('CR', 'AW', 'AWN', 'WS') } expected_mvr = {