Skip to content

CLN: Assorted #52938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 27, 2023
Merged

CLN: Assorted #52938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4261761
clean unused license, c funcs, 1.1.0 reference
mroeschke Apr 26, 2023
aee9bdb
Merge remote-tracking branch 'upstream/main' into cln/assorted
mroeschke Apr 26, 2023
9537e4b
Revert headers
mroeschke Apr 26, 2023
e4eb1c8
Merge remote-tracking branch 'upstream/main' into cln/assorted
mroeschke Apr 27, 2023
225676b
Clean more 1.1 references
mroeschke Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions LICENSES/OTHER
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------------------

Expand Down
2 changes: 0 additions & 2 deletions doc/source/user_guide/merging.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <whatsnew_110.dataframe_or_series_comparing>`.

For example, you might want to compare two ``DataFrame`` and stack their differences
side by side.

Expand Down
2 changes: 0 additions & 2 deletions doc/source/user_guide/window.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pandas-dev/pandas/blob/main/pandas/core/indexers/objects.py>`__

.. 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``.

Expand Down
2 changes: 0 additions & 2 deletions pandas/io/json/_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down