Skip to content

Commit 43ea700

Browse files
committed
Updated config files.
1 parent c09ec81 commit 43ea700

13 files changed

Lines changed: 162 additions & 127 deletions

File tree

.dependabot/config.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ assignees: domdfcoding
99
<!-- Have you searched for similar issues? Before submitting this issue, please check the open issues and add a note before logging a new issue.
1010
1111
PLEASE USE THE TEMPLATE BELOW TO PROVIDE INFORMATION ABOUT THE ISSUE.
12-
INSUFFICIENT INFO WILL GET THE ISSUE CLOSED. IT WILL ONLY BE REOPENED AFTER SUFFICIENT INFO IS PROVIDED-->
12+
THE ISSUE WILL BE CLOSED IF INSUFFICIENT INFORMATION IS PROVIDED.
13+
-->
1314

1415
## Description
1516
<!--Provide a brief description of the issue-->

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ assignees: domdfcoding
77
---
88

99
<!-- Have you searched for similar issues? Someone may already be working on the feature you are suggesting. Before submitting this issue, please check the open issues and add a note before logging a new issue.
10-
11-
PLEASE USE THE TEMPLATE BELOW TO PROVIDE INFORMATION ABOUT THE ISSUE.
12-
INSUFFICIENT INFO WILL GET THE ISSUE CLOSED. IT WILL ONLY BE REOPENED AFTER SUFFICIENT INFO IS PROVIDED-->
10+
-->
1311

1412

1513
## Description

.github/workflows/docs_test_action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
- name: Install and Build 🔧
1515
uses: ammaraskar/sphinx-action@master
1616
with:
17-
pre-build-command: apt-get update && apt-get install gcc python3-dev -y && python -m pip install tox
17+
pre-build-command: apt-get update && apt-get install gcc python3-dev git pandoc -y && python -m pip install tox
1818
docs-folder: "doc-source/"
1919
build-command: "tox -e docs -- "

.isort.cfg

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ known_third_party =
2222
nbconvert
2323
pylint
2424
pytest
25-
pytest-cov
26-
pytest-randomly
27-
pytest-rerunfailures
25+
pytest_cov
26+
pytest_randomly
27+
pytest_rerunfailures
28+
pytest_timeout
2829
requests
2930
known_first_party = notebook2script
3031
remove_redundant_aliases = True

.pre-commit-config.yaml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,48 +22,40 @@ repos:
2222
- id: mixed-line-ending
2323

2424
- repo: https://github.com/domdfcoding/pre-commit-hooks
25-
rev: v0.0.2
25+
rev: v0.0.4
2626
hooks:
2727
- id: requirements-txt-sorter
28+
args: [--allow-git]
2829
- id: check-docstring-first
30+
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup|tests/.*)\.py$
31+
- id: bind-requirements
32+
33+
- repo: https://github.com/domdfcoding/flake8-dunder-all
34+
rev: v0.0.4
35+
hooks:
36+
- id: ensure-dunder-all
37+
files: ^notebook2script/.*\.py$
2938

3039
- repo: https://github.com/pre-commit/pygrep-hooks
3140
rev: v1.5.1
3241
hooks:
3342
- id: python-no-eval
34-
- id: python-use-type-annotations
3543

3644
- repo: https://github.com/asottile/pyupgrade
3745
rev: v1.5.1
3846
hooks:
3947
- id: pyupgrade
4048
args: [--py36-plus]
4149

42-
- repo: https://github.com/timothycrosley/isort
43-
rev: 5.1.4
44-
hooks:
45-
- id: isort
46-
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$
47-
48-
- repo: https://github.com/pre-commit/mirrors-yapf
49-
rev: v0.30.0
50-
hooks:
51-
- id: yapf
52-
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$
53-
args: ["--in-place"]
54-
5550
- repo: https://github.com/Lucas-C/pre-commit-hooks
5651
rev: v1.1.7
5752
hooks:
58-
- id: forbid-crlf
5953
- id: remove-crlf
54+
- id: forbid-crlf
6055

61-
# - repo: https://github.com/shellcheck-py/shellcheck-py
62-
# rev: v0.7.1.1
63-
# hooks:
64-
# - id: shellcheck
6556

66-
# - repo: https://github.com/adrienverge/yamllint
67-
# rev: v1.23.0
68-
# hooks:
69-
# - id: yamllint
57+
- repo: https://github.com/domdfcoding/yapf-isort
58+
rev: v0.3.2
59+
hooks:
60+
- id: yapf-isort
61+
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$

.travis.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@
22
---
33

44
language: python
5-
dist: xenial
5+
dist: focal
66
cache: pip
77
python:
88
- '3.6'
99
- '3.7'
1010
- '3.8'
1111

12+
arch:
13+
- amd64
14+
- arm64
1215
install:
1316

1417
- pip install --upgrade pip
1518
- pip install tox tox-travis
1619
- pip install coveralls coverage_pyver_pragma
1720

1821
script:
19-
- tox
22+
- tox -vv
2023
after_success:
2124
- coveralls
2225

@@ -28,7 +31,20 @@ stages:
2831

2932

3033
jobs:
34+
allow_failures:
35+
- arch: arm64
36+
37+
exclude:
38+
- python: '3.7'
39+
arch: arm64
40+
- python: '3.8'
41+
arch: arm64
42+
3143
include:
44+
- stage: test
45+
dist: bionic
46+
python: 3.8
47+
3248
- stage: deploy_pypi
3349
python: "3.6"
3450
script: skip

CONTRIBUTING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.. This file based on https://github.com/PyGithub/PyGithub/blob/master/CONTRIBUTING.md
2-
31
==============
42
Contributing
53
==============
64

5+
.. This file based on https://github.com/PyGithub/PyGithub/blob/master/CONTRIBUTING.md
6+
77
``notebook2script`` uses `tox <https://tox.readthedocs.io>`_ to automate testing and packaging, and `pre-commit <https://pre-commit.com>`_ to maintain code quality.
88

99
Install ``pre-commit`` with ``pip`` and install the git hook:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ notebook2script
2727

2828
.. |docs| image:: https://img.shields.io/readthedocs/notebook2script/latest?logo=read-the-docs
2929
:target: https://notebook2script.readthedocs.io/en/latest/?badge=latest
30-
:alt: Documentation Status
30+
:alt: Documentation Build Status
3131

3232
.. |docs_check| image:: https://github.com/domdfcoding/notebook2script/workflows/Docs%20Check/badge.svg
3333
:target: https://github.com/domdfcoding/notebook2script/actions?query=workflow%3A%22Docs+Check%22

setup.cfg

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# * metadata
44
# * options
55
# * options.packages.find
6-
# * options.entry_points
76
# * mypy
87
[metadata]
98
name = notebook2script
@@ -49,11 +48,10 @@ exclude =
4948
tests.*
5049
doc-source
5150

52-
[options.entry_points]
53-
console_scripts = notebook2script = notebook2script.__main__:main
54-
5551
[mypy]
5652
python_version = 3.6
57-
ignore_missing_imports = True
5853
namespace_packages = True
5954
check_untyped_defs = True
55+
56+
[options.entry_points]
57+
console_scripts = notebook2script = notebook2script.__main__:main

0 commit comments

Comments
 (0)