From 618561b6b27c10ac43ec407cc412866e634cc110 Mon Sep 17 00:00:00 2001 From: Santhosh18 Date: Fri, 26 Jun 2020 17:33:14 +0530 Subject: [PATCH 1/3] Fixed issue #35010: Double requirement given for fsspec --- doc/source/whatsnew/v1.1.0.rst | 2 +- environment.yml | 1 - requirements-dev.txt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/source/whatsnew/v1.1.0.rst b/doc/source/whatsnew/v1.1.0.rst index 75f406d908c73..a6640ea39804b 100644 --- a/doc/source/whatsnew/v1.1.0.rst +++ b/doc/source/whatsnew/v1.1.0.rst @@ -1136,7 +1136,7 @@ Other - Bug in :class:`Tick` comparisons raising ``TypeError`` when comparing against timedelta-like objects (:issue:`34088`) - Bug in :class:`Tick` multiplication raising ``TypeError`` when multiplying by a float (:issue:`34486`) - Passing a `set` as `names` argument to :func:`pandas.read_csv`, :func:`pandas.read_table`, or :func:`pandas.read_fwf` will raise ``ValueError: Names should be an ordered collection.`` (:issue:`34946`) - +- Fixed bug where two different versions of fsspec is mentioned in requirements-dev.txt (:issue:`35010`) .. --------------------------------------------------------------------------- .. _whatsnew_110.contributors: diff --git a/environment.yml b/environment.yml index 3783b7d360f1a..2429f4ab3d699 100644 --- a/environment.yml +++ b/environment.yml @@ -37,7 +37,6 @@ dependencies: # Dask and its dependencies (that dont install with dask) - dask-core - toolz>=0.7.3 - - fsspec>=0.5.1 - partd>=0.3.10 - cloudpickle>=0.2.1 diff --git a/requirements-dev.txt b/requirements-dev.txt index 90f9fec2f4bdf..44c975a3b3cfb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -22,7 +22,6 @@ nbsphinx pandoc dask toolz>=0.7.3 -fsspec>=0.5.1 partd>=0.3.10 cloudpickle>=0.2.1 markdown From ea306c81ea5483f3870d8af649ce671b46f463ee Mon Sep 17 00:00:00 2001 From: Santhosh18 Date: Fri, 26 Jun 2020 18:08:43 +0530 Subject: [PATCH 2/3] Removed changes from whatsnew --- doc/source/whatsnew/v1.1.0.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/whatsnew/v1.1.0.rst b/doc/source/whatsnew/v1.1.0.rst index a6640ea39804b..78678971005e5 100644 --- a/doc/source/whatsnew/v1.1.0.rst +++ b/doc/source/whatsnew/v1.1.0.rst @@ -1136,7 +1136,6 @@ Other - Bug in :class:`Tick` comparisons raising ``TypeError`` when comparing against timedelta-like objects (:issue:`34088`) - Bug in :class:`Tick` multiplication raising ``TypeError`` when multiplying by a float (:issue:`34486`) - Passing a `set` as `names` argument to :func:`pandas.read_csv`, :func:`pandas.read_table`, or :func:`pandas.read_fwf` will raise ``ValueError: Names should be an ordered collection.`` (:issue:`34946`) -- Fixed bug where two different versions of fsspec is mentioned in requirements-dev.txt (:issue:`35010`) .. --------------------------------------------------------------------------- .. _whatsnew_110.contributors: From ff1c91a1220eb9f3c60569dfb15e5bc2fee9e465 Mon Sep 17 00:00:00 2001 From: Santhosh18 Date: Fri, 26 Jun 2020 18:42:04 +0530 Subject: [PATCH 3/3] Added new line in whatsnew v1.1.0.rst --- doc/source/whatsnew/v1.1.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/whatsnew/v1.1.0.rst b/doc/source/whatsnew/v1.1.0.rst index 78678971005e5..75f406d908c73 100644 --- a/doc/source/whatsnew/v1.1.0.rst +++ b/doc/source/whatsnew/v1.1.0.rst @@ -1136,6 +1136,7 @@ Other - Bug in :class:`Tick` comparisons raising ``TypeError`` when comparing against timedelta-like objects (:issue:`34088`) - Bug in :class:`Tick` multiplication raising ``TypeError`` when multiplying by a float (:issue:`34486`) - Passing a `set` as `names` argument to :func:`pandas.read_csv`, :func:`pandas.read_table`, or :func:`pandas.read_fwf` will raise ``ValueError: Names should be an ordered collection.`` (:issue:`34946`) + .. --------------------------------------------------------------------------- .. _whatsnew_110.contributors: