Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-intake for openSUSE:Factory checked in at 2021-02-15 23:18:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-intake (Old) and /work/SRC/openSUSE:Factory/.python-intake.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-intake" Mon Feb 15 23:18:44 2021 rev:6 rq:872003 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-intake/python-intake.changes 2020-05-26 17:24:08.576596874 +0200 +++ /work/SRC/openSUSE:Factory/.python-intake.new.28504/python-intake.changes 2021-02-15 23:20:58.831815223 +0100 @@ -1,0 +2,14 @@ +Sat Feb 13 11:03:17 UTC 2021 - Ben Greiner <[email protected]> + +- Update to 0.6.0 + * no changelog +- Skip python36 build: Packages depening on numpy are in the + dependency tree (NEP 29) +- Add test files + * tests-data.zarr.0 + * tests-data.zarr.zarray + * calvert_uk_filter.tar.gz +- Add intake-pr560-fix-category-ordering.patch gh#intake/intake#560 + in order to support newer dask versions + +------------------------------------------------------------------- Old: ---- intake-0.5.4.tar.gz New: ---- calvert_uk_filter.tar.gz intake-0.6.0.tar.gz intake-pr560-fix-category-ordering.patch tests-data.zarr.0 tests-data.zarr.zarray ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-intake.spec ++++++ --- /var/tmp/diff_new_pack.fvT3Dl/_old 2021-02-15 23:20:59.871816776 +0100 +++ /var/tmp/diff_new_pack.fvT3Dl/_new 2021-02-15 23:20:59.875816782 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-intake # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,64 +18,60 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +# NEP 29: packages in the dependency tree which droped Python 3.6 support in TW +%define skip_python36 1 Name: python-intake -Version: 0.5.4 +Version: 0.6.0 Release: 0 Summary: Data loading and cataloging system License: BSD-2-Clause -URL: https://github.com/ContinuumIO/intake +URL: https://github.com/intake/intake Source0: https://files.pythonhosted.org/packages/source/i/intake/intake-%{version}.tar.gz +# Test data +Source1: https://raw.githubusercontent.com/intake/intake/%{version}/intake/source/tests/data.zarr/.zarray#/tests-data.zarr.zarray +Source2: https://raw.githubusercontent.com/intake/intake/%{version}/intake/source/tests/data.zarr/0#/tests-data.zarr.0 +Source3: https://raw.githubusercontent.com/intake/intake/%{version}/intake/source/tests/calvert_uk_filter.tar.gz +# PATCH-FIX-UPSTREAM intake-pr560-fix-category-ordering.patch gh#intake/intake#560 +Patch0: intake-pr560-fix-category-ordering.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-Jinja2 Requires: python-PyYAML Requires: python-appdirs Requires: python-dask -Requires: python-dask-array -Requires: python-dask-bag >= 1.0 -Requires: python-dask-dataframe +Requires: python-dask-bag Requires: python-entrypoints -Requires: python-fsspec >= 0.3.6 -Requires: python-holoviews -Requires: python-hvplot -Requires: python-ipywidgets >= 7.2 -Requires: python-msgpack -Requires: python-msgpack-numpy -Requires: python-numpy -Requires: python-pandas -Requires: python-pytest +Requires: python-fsspec >= 0.7.4 Requires: python-python-snappy -Requires: python-requests -Requires: python-ruamel.yaml >= 0.15.0 -Requires: python-six -Requires: python-tornado >= 4.5.1 +Requires: python-tornado +Recommends: python-hvplot +Recommends: python-panel >= 0.7.0 +Recommends: python-bokeh +Recommends: python-dask-dataframe +Recommends: python-msgpack-numpy +Recommends: python-pyarrow Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module aiohttp} BuildRequires: %{python_module appdirs} -BuildRequires: %{python_module dask-array} -BuildRequires: %{python_module dask-bag >= 1.0} +BuildRequires: %{python_module bokeh} +BuildRequires: %{python_module dask-bag} BuildRequires: %{python_module dask-dataframe} BuildRequires: %{python_module dask} BuildRequires: %{python_module entrypoints} -BuildRequires: %{python_module fsspec >= 0.3.6} -BuildRequires: %{python_module holoviews} -BuildRequires: %{python_module hvplot} -BuildRequires: %{python_module ipywidgets >= 7.2} +BuildRequires: %{python_module fsspec >= 0.7.4} +BuildRequires: %{python_module hvplot >= 0.5.2} BuildRequires: %{python_module msgpack-numpy} -BuildRequires: %{python_module msgpack} -BuildRequires: %{python_module numpy} -BuildRequires: %{python_module pandas} +BuildRequires: %{python_module notebook} +BuildRequires: %{python_module panel >= 0.8.9} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-snappy} BuildRequires: %{python_module requests} -BuildRequires: %{python_module ruamel.yaml >= 0.15.0} -BuildRequires: %{python_module six} -BuildRequires: %{python_module tornado >= 4.5.1} +BuildRequires: %{python_module tornado} +BuildRequires: %{python_module zarr} # /SECTION %python_subpackages @@ -83,10 +79,15 @@ A plugin system for loading your data and making data catalogs. %prep -%setup -q -n intake-%{version} +%autosetup -p1 -n intake-%{version} sed -i -e '/^#!\//, 1d' intake/catalog/tests/test_persist.py sed -i -e '/^#!\//, 1d' intake/container/tests/__init__.py sed -i -e '/^#!\//, 1d' intake/container/tests/test_generics.py +sed -i -e "/import os/ a import sys" -e "s/cmd = \['python'/cmd = \[sys.executable/" intake/conftest.py +mkdir -p intake/source/tests/data.zarr +cp %{SOURCE1} intake/source/tests/data.zarr/.zarray +cp %{SOURCE2} intake/source/tests/data.zarr/0 +cp %{SOURCE3} intake/source/tests/calvert_uk_filter.tar.gz %build %python_build @@ -96,9 +97,21 @@ %python_clone -a %{buildroot}%{_bindir}/intake %python_clone -a %{buildroot}%{_bindir}/intake-server %python_expand %fdupes %{buildroot}%{$python_sitelib} -%python_expand $python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/intake/cli/tests/ -%python_expand $python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/intake/cli/tests/ -%python_expand %fdupes %{buildroot}%{$python_sitelib}/intake/cli/tests/ +%python_expand chmod a-x %{buildroot}%{$python_sitelib}/intake-%{version}*-info/* + +%check +%{python_expand # provide entrypoint for flavor +mkdir -p build/testbin +ln -s %{buildroot}%{_bindir}/intake-%{$python_bin_suffix} build/testbin/intake +ln -s %{buildroot}%{_bindir}/intake-server-%{$python_bin_suffix} build/testbin/intake-server +} +export PATH=$PWD/build/testbin:$PATH +# Looks for `which python`, which we don't have in TW +donttest+=" or test_which" +# test_discover_cli overrides the PYTHONPATH and thus doesn't find the package in buildroot +# test_discover does not find its own config because the registration does not work in our test env +donttest+=" or test_discover" +%pytest -ra -k "not (${donttest:4})" %post %python_install_alternative intake @@ -113,6 +126,7 @@ %license LICENSE %python_alternative %{_bindir}/intake-server %python_alternative %{_bindir}/intake -%{python_sitelib}/* +%{python_sitelib}/intake +%{python_sitelib}/intake-%{version}*-info %changelog ++++++ intake-0.5.4.tar.gz -> intake-0.6.0.tar.gz ++++++ ++++ 5593 lines of diff (skipped) ++++++ intake-pr560-fix-category-ordering.patch ++++++ >From 92e7725900befac1ce05c1f13e0c18bd57d20898 Mon Sep 17 00:00:00 2001 From: Martin Durant <[email protected]> Date: Wed, 16 Dec 2020 11:56:19 -0500 Subject: [PATCH 1/2] Fix category ordering for path column --- intake/source/csv.py | 12 +++--------- intake/source/utils.py | 2 ++ 2 files changed, 5 insertions(+), 9 deletions(-) Index: intake-0.6.0/intake/source/csv.py =================================================================== --- intake-0.6.0.orig/intake/source/csv.py +++ intake-0.6.0/intake/source/csv.py @@ -58,20 +58,14 @@ class CSVSource(base.DataSource, base.Pa def _set_pattern_columns(self, path_column): """Get a column of values for each field in pattern """ - try: - # CategoricalDtype allows specifying known categories when - # creating objects. It was added in pandas 0.21.0. - from pandas.api.types import CategoricalDtype - _HAS_CDT = True - except ImportError: - _HAS_CDT = False + from pandas.api.types import CategoricalDtype col = self._dataframe[path_column] - paths = col.cat.categories + paths = sorted(col.cat.categories) column_by_field = {field: col.cat.codes.map(dict(enumerate(values))).astype( - "category" if not _HAS_CDT else CategoricalDtype(set(values)) + CategoricalDtype(set(values)) ) for field, values in reverse_formats(self.pattern, paths).items() } self._dataframe = self._dataframe.assign(**column_by_field) @@ -102,12 +96,6 @@ class CSVSource(base.DataSource, base.Pa **self._csv_kwargs) return - if not (DASK_VERSION >= '0.19.0'): - raise ValueError("Your version of dask is '{}'. " - "The ability to include filenames in read_csv output " - "(``include_path_column``) was added in 0.19.0, so " - "pattern urlpaths are not supported.".format(DASK_VERSION)) - drop_path_column = 'include_path_column' not in self._csv_kwargs path_column = self._path_column() Index: intake-0.6.0/intake/source/utils.py =================================================================== --- intake-0.6.0.orig/intake/source/utils.py +++ intake-0.6.0/intake/source/utils.py @@ -212,6 +212,7 @@ def reverse_format(format_string, resolv return args + def path_to_glob(path): """ Convert pattern style paths to glob style paths @@ -255,6 +256,7 @@ def path_to_glob(path): return glob + def path_to_pattern(path, metadata=None): """ Remove source information from path when using chaching ++++++ tests-data.zarr.zarray ++++++ { "chunks": [ 10 ], "compressor": { "blocksize": 0, "clevel": 5, "cname": "lz4", "id": "blosc", "shuffle": 1 }, "dtype": "<i8", "fill_value": 0, "filters": null, "order": "C", "shape": [ 10 ], "zarr_format": 2 }
