Skip to content

Commit 7218432

Browse files
committed
Updated files with 'repo_helper'.
1 parent ae05388 commit 7218432

10 files changed

Lines changed: 60 additions & 124 deletions

File tree

.dependabot/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3+
version: 1
34
update_configs:
4-
- default_reviewers:
5-
- domdfcoding
5+
- package_manager: python
66
directory: /
7-
package_manager: python
87
update_schedule: weekly
9-
version: 1
8+
default_reviewers:
9+
- domdfcoding

.github/auto_assign.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
43
addReviewers: true
54
addAssignees: true
6-
7-
# A list of reviewers to be added to pull requests (GitHub user name)
85
reviewers:
9-
- domdfcoding
10-
11-
# A number of reviewers added to the pull request
12-
# Set 0 to add all the reviewers
6+
- domdfcoding
137
numberOfReviewers: 0
148

15-
# A list of assignees, overrides reviewers if set
16-
# assignees:
17-
# - assigneeA
18-
19-
# A number of assignees to add to the pull request
20-
# Set to 0 to add all of the assignees.
21-
# Uses numberOfReviewers if unset.
22-
# numberOfAssignees: 2
23-
249
# more settings at https://github.com/marketplace/actions/auto-assign-action

.isort.cfg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ use_parentheses = True
1414
default_section = THIRDPARTY
1515
;no_lines_before=LOCALFOLDER
1616
known_third_party =
17-
IPython
1817
astroid
1918
coverage
20-
coverage_pyver_pragma
21-
domdf_python_tools
19+
coverage-pyver-pragma
20+
domdf-python-tools
2221
github
22+
ipython
2323
nbconvert
2424
pylint
2525
pytest
26-
pytest_cov
27-
pytest_randomly
28-
pytest_rerunfailures
29-
pytest_timeout
26+
pytest-cov
27+
pytest-randomly
28+
pytest-rerunfailures
29+
pytest-timeout
3030
requests
31-
yapf_isort
31+
yapf-isort
3232
known_first_party = notebook2script
3333
remove_redundant_aliases = True

.pre-commit-config.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
33

4+
exclude: ^$
5+
46
repos:
57
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v2.4.0
8+
rev: v3.3.0
79
hooks:
810
- id: check-added-large-files
911
- id: check-ast
1012
- id: check-byte-order-marker
1113
- id: check-case-conflict
1214
- id: check-executables-have-shebangs
1315
- id: check-json
16+
- id: check-toml
17+
- id: check-yaml
1418
- id: check-merge-conflict
1519
- id: check-symlinks
16-
- id: check-toml
1720
- id: check-vcs-permalinks
18-
- id: check-yaml
1921
- id: detect-private-key
2022
- id: end-of-file-fixer
2123
- id: trailing-whitespace
@@ -25,13 +27,14 @@ repos:
2527
rev: v0.0.4
2628
hooks:
2729
- id: requirements-txt-sorter
28-
args: [--allow-git]
30+
args:
31+
- --allow-git
2932
- id: check-docstring-first
3033
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup|tests/.*)\.py$
3134
- id: bind-requirements
3235

3336
- repo: https://github.com/domdfcoding/flake8-dunder-all
34-
rev: v0.0.4
37+
rev: v0.1.0
3538
hooks:
3639
- id: ensure-dunder-all
3740
files: ^notebook2script/.*\.py$
@@ -42,20 +45,20 @@ repos:
4245
- id: python-no-eval
4346

4447
- repo: https://github.com/asottile/pyupgrade
45-
rev: v1.5.1
48+
rev: v2.7.3
4649
hooks:
4750
- id: pyupgrade
48-
args: [--py36-plus]
51+
args:
52+
- --py36-plus
4953

5054
- repo: https://github.com/Lucas-C/pre-commit-hooks
51-
rev: v1.1.7
55+
rev: v1.1.9
5256
hooks:
5357
- id: remove-crlf
5458
- id: forbid-crlf
5559

56-
5760
- repo: https://github.com/domdfcoding/yapf-isort
58-
rev: v0.3.2
61+
rev: v0.4.4
5962
hooks:
6063
- id: yapf-isort
6164
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ stages:
2929
- deploy_pypi
3030

3131

32-
3332
jobs:
3433
allow_failures:
3534
- arch: arm64

README.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ notebook2script
1515
:widths: 10 90
1616

1717
* - Tests
18-
- |travis| |actions_windows| |actions_macos| |coveralls| |codefactor|
18+
- |travis| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
1919
* - PyPI
2020
- |pypi-version| |supported-versions| |supported-implementations| |wheel|
2121
* - Activity
@@ -87,6 +87,10 @@ notebook2script
8787
:target: https://github.com/pre-commit/pre-commit
8888
:alt: pre-commit
8989

90+
.. |pre_commit_ci| image:: https://results.pre-commit.ci/badge/github/domdfcoding/notebook2script/master.svg
91+
:target: https://results.pre-commit.ci/latest/github/domdfcoding/notebook2script/master
92+
:alt: pre-commit.ci status
93+
9094
.. end shields
9195
9296
|

__pkginfo__.py

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,17 @@
1717
__all__ = [
1818
"__copyright__",
1919
"__version__",
20-
"modname",
21-
"pypi_name",
22-
"__license__",
23-
"__author__",
24-
"short_desc",
25-
"author",
26-
"author_email",
27-
"github_username",
28-
"web",
29-
"github_url",
3020
"repo_root",
3121
"install_requires",
3222
"extras_require",
33-
"project_urls",
34-
35-
"import_name",
3623
]
3724

3825
__copyright__ = """
3926
2020 Dominic Davis-Foster <dominic@davis-foster.co.uk>
4027
"""
4128

4229
__version__ = "0.0.0"
43-
modname = "notebook2script"
44-
pypi_name = "notebook2script"
45-
import_name = "notebook2script"
46-
__license__ = "GNU General Public License v2 (GPLv2)"
47-
short_desc = 'Convert Jupyter Notebooks to Python Scripts.'
48-
__author__ = author = 'Dominic Davis-Foster'
49-
author_email = 'dominic@davis-foster.co.uk'
50-
github_username = "domdfcoding"
51-
web = github_url = "https://github.com/domdfcoding/notebook2script"
30+
5231
repo_root = pathlib.Path(__file__).parent
5332
install_requires = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')
5433
extras_require = {'all': []}
55-
56-
57-
58-
project_urls = {
59-
"Documentation": "https://notebook2script.readthedocs.io",
60-
"Issue Tracker": f"{github_url}/issues",
61-
"Source Code": github_url,
62-
}

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# * options
55
# * options.packages.find
66
# * mypy
7+
78
[metadata]
89
name = notebook2script
910
author = Dominic Davis-Foster
@@ -15,7 +16,6 @@ long_description_content_type = text/x-rst
1516
platforms = Windows, macOS, Linux
1617
url = https://github.com/domdfcoding/notebook2script
1718
project_urls =
18-
Documentation = https://notebook2script.readthedocs.io
1919
Issue_Tracker = https://github.com/domdfcoding/notebook2script/issues
2020
Source_Code = https://github.com/domdfcoding/notebook2script
2121
classifiers =
@@ -37,7 +37,7 @@ classifiers =
3737
Typing :: Typed
3838

3939
[options]
40-
python_requires = >=3.6
40+
python_requires = >=3.6.1
4141
zip_safe = False
4242
include_package_data = True
4343
packages = find:
@@ -52,6 +52,7 @@ exclude =
5252
python_version = 3.6
5353
namespace_packages = True
5454
check_untyped_defs = True
55+
warn_unused_ignores = True
5556

5657
[options.entry_points]
5758
console_scripts = notebook2script = notebook2script.__main__:main

tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
coverage>=5.1
2-
coverage_pyver_pragma>=0.0.6
2+
coverage-pyver-pragma>=0.0.6
33
iniconfig!=1.1.0,>=1.0.1
44
pytest>=6.0.0
55
pytest-cov>=2.8.1

tox.ini

Lines changed: 24 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ commands =
5454
skip_install = True
5555
changedir = {toxinidir}
5656
deps =
57-
twine
58-
pep517
59-
check-wheel-contents
57+
twine>=3.2.0
58+
pep517>=0.9.1
59+
check-wheel-contents>=0.1.0
6060
commands =
6161
python -m pep517.build --source --binary "{toxinidir}"
6262
twine check dist/*
@@ -70,17 +70,20 @@ skip_install = True
7070
deps =
7171
flake8 >=3.8.2
7272
flake8-2020 >= 1.6.0
73-
flake8_strftime
74-
flake8-pytest-style
75-
flake8-docstrings
76-
flake8-typing-imports
77-
flake8-sphinx-links
78-
flake8-dunder-all
79-
git+https://github.com/domdfcoding/flake8-rst-docstrings.git
80-
flake8-builtins
81-
pygments
73+
flake8-builtins>=1.5.3
74+
flake8-docstrings>=1.5.0
75+
flake8-dunder-all>=0.0.4
76+
flake8-pyi>=20.10.0
77+
flake8-pytest-style>=1.3.0
78+
flake8-sphinx-links>=0.0.4
79+
flake8-strftime>=0.1.1
80+
flake8-typing-imports>=1.10.0
81+
git+https://github.com/PyCQA/pydocstyle@5118faa7173b0e5bbc230c4adf628758e13605bf
8282
git+https://github.com/domdfcoding/flake8-quotes.git
83-
commands = flake8 notebook2script tests
83+
git+https://github.com/domdfcoding/flake8-rst-docstrings.git
84+
git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git
85+
pygments>=2.7.1
86+
commands = python3 -m flake8_rst_docstrings_sphinx notebook2script tests --allow-toolbox
8487

8588
[testenv:yapf]
8689
basepython = python3.7
@@ -115,59 +118,29 @@ ignore_errors = True
115118
whitelist_externals = /bin/bash
116119
changedir = {toxinidir}
117120
deps =
118-
coverage
119-
coverage_pyver_pragma
121+
coverage>=5
122+
coverage_pyver_pragma>=0.0.6
120123
commands =
121124
/bin/bash -c "rm -rf htmlcov"
122125
coverage html
123126
/bin/bash -c "DISPLAY=:0 firefox 'htmlcov/index.html'"
124127

125128
[flake8]
126129
max-line-length = 120
127-
select = E301 E303 E304 E305 E306 E502 W291 W293 W391 E226 E225 E241 E231 W292 E265 E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E227 E228 E242 E251 E261 E262 E271 E272 E402 E703 E711 E712 E713 E714 E721 W504 E302 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT004 PT005 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q000 Q001 Q002 Q003 A001 A002 A003 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
130+
select = E301 E303 E304 E305 E306 E502 W291 W293 W391 E226 E225 E241 E231 W292 E265 E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E227 E228 E242 E251 E261 E262 E271 E272 E402 E703 E711 E712 E713 E714 E721 W504 E302 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT004 PT005 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q000 Q001 Q002 Q003 A001 A002 A003 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
128131
exclude = .git,__pycache__,doc-source,old,build,dist,make_conda_recipe.py,__pkginfo__.py,setup.py
129-
rst-roles =
130-
class
131-
func
132-
mod
133-
py:obj
134-
py:class
135-
ref
136-
meth
137-
exc
138-
attr
139-
wikipedia
140-
rst:role
141-
rst:dir
142-
pull
143-
issue
144-
asset
145-
confval
146132
rst-directives =
147-
envvar
148-
exception
149-
seealso
150133
TODO
151-
versionadded
152-
versionchanged
153-
rest-example
134+
envvar
154135
extras-require
155-
literalinclude
156-
autoclass
157-
extensions
158-
deprecated
159-
versionremoved
160-
autofunction
161-
confval
162-
rst:directive
163-
rst:directive:option
164-
rst:role
165-
pre-commit-shield
166-
per-file-ignores = tests/*: D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
136+
per-file-ignores =
137+
tests/*: D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
138+
*/*.pyi: D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
167139
pytest-parametrize-names-type = csv
168140
inline-quotes = "
169141
multiline-quotes = """
170142
docstring-quotes = """
143+
count = True
171144
172145
[coverage:run]
173146
plugins = coverage_pyver_pragma

0 commit comments

Comments
 (0)