From 4261761c57513768d70a7386bfb71e84dcb296b8 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:11:43 -0700 Subject: [PATCH 1/3] clean unused license, c funcs, 1.1.0 reference --- LICENSES/OTHER | 18 ------------------ doc/source/user_guide/merging.rst | 2 -- pandas/_libs/src/headers/portable.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/LICENSES/OTHER b/LICENSES/OTHER index 7446d68eb43a6..e156152990cc4 100644 --- a/LICENSES/OTHER +++ b/LICENSES/OTHER @@ -26,24 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -google-api-python-client license --------------------------------- - -Copyright (C) 2012 Google Inc. -All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - Pyperclip v1.3 license ---------------------- diff --git a/doc/source/user_guide/merging.rst b/doc/source/user_guide/merging.rst index cf8d7a05bf6e7..962de385a08c5 100644 --- a/doc/source/user_guide/merging.rst +++ b/doc/source/user_guide/merging.rst @@ -1454,8 +1454,6 @@ Comparing objects The :meth:`~Series.compare` and :meth:`~DataFrame.compare` methods allow you to compare two DataFrame or Series, respectively, and summarize their differences. -This feature was added in :ref:`V1.1.0 `. - For example, you might want to compare two ``DataFrame`` and stack their differences side by side. diff --git a/pandas/_libs/src/headers/portable.h b/pandas/_libs/src/headers/portable.h index a34f833b7fd6b..60e842e6839bf 100644 --- a/pandas/_libs/src/headers/portable.h +++ b/pandas/_libs/src/headers/portable.h @@ -10,6 +10,3 @@ // from MUSL libc, MIT Licensed - see LICENSES #define isdigit_ascii(c) (((unsigned)(c) - '0') < 10u) #define getdigit_ascii(c, default) (isdigit_ascii(c) ? ((int)((c) - '0')) : default) -#define isspace_ascii(c) (((c) == ' ') || (((unsigned)(c) - '\t') < 5)) -#define toupper_ascii(c) ((((unsigned)(c) - 'a') < 26) ? ((c) & 0x5f) : (c)) -#define tolower_ascii(c) ((((unsigned)(c) - 'A') < 26) ? ((c) | 0x20) : (c)) From 9537e4b69cc5ba684816945f139e55c4b1cae321 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:26:36 -0700 Subject: [PATCH 2/3] Revert headers --- pandas/_libs/src/headers/portable.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandas/_libs/src/headers/portable.h b/pandas/_libs/src/headers/portable.h index 60e842e6839bf..a34f833b7fd6b 100644 --- a/pandas/_libs/src/headers/portable.h +++ b/pandas/_libs/src/headers/portable.h @@ -10,3 +10,6 @@ // from MUSL libc, MIT Licensed - see LICENSES #define isdigit_ascii(c) (((unsigned)(c) - '0') < 10u) #define getdigit_ascii(c, default) (isdigit_ascii(c) ? ((int)((c) - '0')) : default) +#define isspace_ascii(c) (((c) == ' ') || (((unsigned)(c) - '\t') < 5)) +#define toupper_ascii(c) ((((unsigned)(c) - 'a') < 26) ? ((c) & 0x5f) : (c)) +#define tolower_ascii(c) ((((unsigned)(c) - 'A') < 26) ? ((c) | 0x20) : (c)) From 225676b55a0d812024c38228e30dde527e3c747c Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Wed, 26 Apr 2023 17:09:54 -0700 Subject: [PATCH 3/3] Clean more 1.1 references --- doc/source/user_guide/window.rst | 2 -- pandas/io/json/_json.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/doc/source/user_guide/window.rst b/doc/source/user_guide/window.rst index 72c631631ab62..dcbae66906a29 100644 --- a/doc/source/user_guide/window.rst +++ b/doc/source/user_guide/window.rst @@ -287,8 +287,6 @@ and we want to use an expanding window where ``use_expanding`` is ``True`` other You can view other examples of ``BaseIndexer`` subclasses `here `__ -.. versionadded:: 1.1 - One subclass of note within those examples is the ``VariableOffsetWindowIndexer`` that allows rolling operations over a non-fixed offset like a ``BusinessDay``. diff --git a/pandas/io/json/_json.py b/pandas/io/json/_json.py index 3b5c14027e7a7..8775c65f140a8 100644 --- a/pandas/io/json/_json.py +++ b/pandas/io/json/_json.py @@ -641,8 +641,6 @@ def read_json( This can only be passed if `lines=True`. If this is None, all the rows will be returned. - .. versionadded:: 1.1 - {storage_options} .. versionadded:: 1.2.0