Skip to content

Commit

Permalink
Vendor the Version package, use it instead of distutils (#2659)
Browse files Browse the repository at this point in the history
* Vendor the Version package, use it instead of distutils

* add packaging license
  • Loading branch information
dannysepler authored Sep 13, 2021
1 parent 78e9c08 commit a0f7bf8
Show file tree
Hide file tree
Showing 10 changed files with 507 additions and 24 deletions.
23 changes: 23 additions & 0 deletions licences/PACKAGING_LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Copyright (c) Donald Stufft and individual contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 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.
4 changes: 2 additions & 2 deletions seaborn/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from collections.abc import Iterable, Sequence, Mapping
from numbers import Number
from datetime import datetime
from distutils.version import LooseVersion

import numpy as np
import pandas as pd
Expand All @@ -15,6 +14,7 @@
from ._decorators import (
share_init_params_with_map,
)
from .external.version import Version
from .palettes import (
QUAL_PALETTES,
color_palette,
Expand Down Expand Up @@ -1252,7 +1252,7 @@ def _attach(
if scale is True:
set_scale("log")
else:
if LooseVersion(mpl.__version__) >= "3.3":
if Version(mpl.__version__) >= Version("3.3"):
set_scale("log", base=scale)
else:
set_scale("log", **{f"base{axis}": scale})
Expand Down
Loading

0 comments on commit a0f7bf8

Please sign in to comment.