Skip to content

Commit ed0330c

Browse files
authored
Merge branch 'main' into cancel_invite
2 parents 4df7015 + e650c1d commit ed0330c

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ repos:
1414
types: [text]
1515
stages: [commit, push, manual]
1616
- repo: https://github.com/asottile/reorder_python_imports
17-
rev: v3.8.2
17+
rev: v3.9.0
1818
hooks:
1919
- id: reorder-python-imports
2020
args: [--application-directories, '.:src', --py37-plus]
2121
- repo: https://github.com/psf/black
22-
rev: 22.6.0
22+
rev: 22.10.0
2323
hooks:
2424
- id: black
2525
- repo: https://github.com/asottile/pyupgrade
26-
rev: v2.37.3
26+
rev: v3.2.2
2727
hooks:
2828
- id: pyupgrade
2929
args: [--py37-plus]
@@ -33,11 +33,11 @@ repos:
3333
# - id: mypy
3434
# exclude: ^(docs/|tests/)
3535
- repo: https://github.com/jorisroovers/gitlint
36-
rev: v0.17.0
36+
rev: v0.18.0
3737
hooks:
3838
- id: gitlint
3939
- repo: https://github.com/asottile/setup-cfg-fmt
40-
rev: v2.0.0
40+
rev: v2.2.0
4141
hooks:
4242
- id: setup-cfg-fmt
4343
args: [--min-py3-version, '3.7']

LICENSE

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
1+
BSD 3-Clause License
2+
3+
Copyright (c) 2012, Ian Stapleton Cordasco
4+
15
Redistribution and use in source and binary forms, with or without
26
modification, are permitted provided that the following conditions are
37
met:
48

59
1. Redistributions of source code must retain the above copyright
610
notice, this list of conditions and the following disclaimer.
11+
712
2. Redistributions in binary form must reproduce the above copyright
813
notice, this list of conditions and the following disclaimer in the
914
documentation and/or other materials provided with the distribution.
10-
3. The name of the author may not be used to endorse or promote products
11-
derived from this software without specific prior written permission.
1215

13-
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
14-
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16-
DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
17-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
21-
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
22-
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
23-
POSSIBILITY OF SUCH DAMAGE.
16+
3. Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ long_description_content_type = text/x-rst
77
url = https://github3.readthedocs.io
88
author = Ian Stapleton Cordasco
99
author_email = [email protected]
10-
license = 3-clause BSD
10+
license = BSD-3-Clause
1111
license_file = LICENSE
1212
classifiers =
1313
Development Status :: 5 - Production/Stable

0 commit comments

Comments
 (0)