Skip to content

Commit 024b206

Browse files
authored
Update minimum/max python versions, update packages (anvilco#43)
* Update minimum/max python versions, update packages * Remove pytest-expecter * Update changelog * Maybe add more python versions * Use pipx instead? * Dont touch * Update pylint config, lint fixes * Fix test * Update CHANGELOG, add one more python version * Update pre-commit * Quote 3.10 * Bump version
1 parent 6659040 commit 024b206

File tree

21 files changed

+684
-773
lines changed

21 files changed

+684
-773
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: [3.7]
11+
python-version: [3.7, 3.8, 3.9, "3.10"]
1212

1313
steps:
1414
- uses: actions/checkout@v3
1515

16-
- name: Install Poetry
17-
uses: snok/install-poetry@v1
18-
with:
19-
virtualenvs-create: true
20-
virtualenvs-in-project: true
16+
- name: Install poetry
17+
run: pipx install poetry
2118

2219
- name: Set up Python ${{ matrix.python-version }}
2320
uses: actions/setup-python@v4

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.3.0
3+
rev: v4.4.0
44
hooks:
55
- id: check-yaml
66
- id: end-of-file-fixer
77
- id: trailing-whitespace
88
- repo: https://github.com/psf/black
9-
rev: 22.3.0
9+
rev: 22.12.0
1010
hooks:
1111
- id: black

.pylint.ini

Lines changed: 18 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -51,85 +51,29 @@ confidence=
5151
# no Warning level messages displayed, use"--disable=all --enable=classes
5252
# --disable=W"
5353
disable=
54-
print-statement,
55-
parameter-unpacking,
56-
unpacking-in-except,
57-
old-raise-syntax,
58-
backtick,
59-
long-suffix,
60-
old-ne-operator,
61-
old-octal-literal,
62-
import-star-module-level,
63-
raw-checker-failed,
64-
bad-inline-option,
65-
locally-disabled,
66-
locally-enabled,
67-
file-ignored,
68-
suppressed-message,
69-
useless-suppression,
70-
deprecated-pragma,
71-
apply-builtin,
72-
basestring-builtin,
73-
buffer-builtin,
74-
cmp-builtin,
75-
coerce-builtin,
76-
execfile-builtin,
77-
file-builtin,
78-
long-builtin,
79-
raw_input-builtin,
80-
reduce-builtin,
81-
standarderror-builtin,
82-
unicode-builtin,
83-
xrange-builtin,
84-
coerce-method,
85-
delslice-method,
86-
getslice-method,
87-
setslice-method,
88-
no-absolute-import,
89-
old-division,
90-
dict-iter-method,
91-
dict-view-method,
92-
next-method-called,
93-
metaclass-assignment,
94-
indexing-exception,
95-
raising-string,
96-
reload-builtin,
97-
oct-method,
98-
hex-method,
99-
nonzero-method,
100-
cmp-method,
101-
input-builtin,
102-
round-builtin,
103-
intern-builtin,
104-
unichr-builtin,
105-
map-builtin-not-iterating,
106-
zip-builtin-not-iterating,
107-
range-builtin-not-iterating,
108-
filter-builtin-not-iterating,
109-
using-cmp-argument,
110-
eq-without-hash,
111-
div-method,
112-
idiv-method,
113-
rdiv-method,
114-
exception-message-attribute,
115-
invalid-str-codec,
116-
sys-max-int,
117-
bad-python3-import,
118-
deprecated-string-function,
119-
deprecated-str-translate-call,
120-
missing-docstring,
54+
fixme,
55+
global-statement,
12156
invalid-name,
57+
missing-docstring,
58+
redefined-outer-name,
12259
too-few-public-methods,
123-
fixme,
60+
too-many-locals,
12461
too-many-arguments,
62+
unnecessary-pass,
63+
broad-except,
64+
duplicate-code,
12565
too-many-branches,
126-
unpacking-non-sequence,
127-
wildcard-import,
128-
unused-wildcard-import,
129-
singleton-comparison,
130-
bad-continuation,
66+
too-many-return-statements,
67+
too-many-public-methods,
68+
too-many-ancestors,
69+
too-many-instance-attributes,
70+
too-many-statements,
71+
attribute-defined-outside-init,
72+
unsupported-assignment-operation,
73+
unsupported-delete-operation,
74+
too-many-nested-blocks,
75+
protected-access,
13176
wrong-import-order,
132-
unsubscriptable-object,
13377

13478
# Enable the message, report, category or checker with the given id(s). You can
13579
# either give multiple identifier separated by comma (,) or put this option
@@ -171,46 +115,28 @@ max-nested-blocks=5
171115

172116
[BASIC]
173117

174-
# Naming hint for argument names
175-
argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
176-
177118
# Regular expression matching correct argument names
178119
argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
179120

180-
# Naming hint for attribute names
181-
attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
182-
183121
# Regular expression matching correct attribute names
184122
attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
185123

186124
# Bad variable names which should always be refused, separated by a comma
187125
bad-names=foo,bar,baz,toto,tutu,tata
188126

189-
# Naming hint for class attribute names
190-
class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
191-
192127
# Regular expression matching correct class attribute names
193128
class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
194129

195-
# Naming hint for class names
196-
class-name-hint=[A-Z_][a-zA-Z0-9]+$
197-
198130
# Regular expression matching correct class names
199131
class-rgx=[A-Z_][a-zA-Z0-9]+$
200132

201-
# Naming hint for constant names
202-
const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
203-
204133
# Regular expression matching correct constant names
205134
const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
206135

207136
# Minimum line length for functions/classes that require docstrings, shorter
208137
# ones are exempt.
209138
docstring-min-length=-1
210139

211-
# Naming hint for function names
212-
function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
213-
214140
# Regular expression matching correct function names
215141
function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
216142

@@ -220,21 +146,12 @@ good-names=i,j,k,ex,Run,_
220146
# Include a hint for the correct naming format with invalid-name
221147
include-naming-hint=no
222148

223-
# Naming hint for inline iteration names
224-
inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
225-
226149
# Regular expression matching correct inline iteration names
227150
inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
228151

229-
# Naming hint for method names
230-
method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
231-
232152
# Regular expression matching correct method names
233153
method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
234154

235-
# Naming hint for module names
236-
module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
237-
238155
# Regular expression matching correct module names
239156
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
240157

@@ -250,9 +167,6 @@ no-docstring-rgx=^_
250167
# to this list to register other decorators that produce valid properties.
251168
property-classes=abc.abstractproperty
252169

253-
# Naming hint for variable names
254-
variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
255-
256170
# Regular expression matching correct variable names
257171
variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
258172

@@ -278,12 +192,6 @@ max-line-length=88
278192
# Maximum number of lines in a module
279193
max-module-lines=1000
280194

281-
# List of optional constructs for which whitespace checking is disabled. `dict-
282-
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
283-
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
284-
# `empty-line` allows space-only lines.
285-
no-space-check=trailing-comma,dict-separator
286-
287195
# Allow the body of a class to be on the same line as the declaration if body
288196
# contains single statement.
289197
single-line-class-stmt=no

.python-version

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3.6.14
2-
3.7.11
3-
3.8.11
4-
3.9.5
1+
3.7.13
2+
3.8.13
3+
3.9.12
4+
3.10.4

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.0.0 (2023-01-26)
2+
3+
- **[BREAKING CHANGE]** Minimum required Python version updated to `>=3.7.2`
4+
15
# 1.9.0 (2023-01-26)
26

37
- Clearer version number support

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ $(DEPENDENCIES): poetry.lock
4242
@ rm -rf $(VIRTUAL_ENV)/.poetry-*
4343
@ poetry config virtualenvs.in-project true
4444
poetry install
45-
@ touch $@
45+
#@ touch $@
4646

4747
ifndef CI
4848
poetry.lock: pyproject.toml
4949
poetry lock --no-update
50-
@ touch $@
50+
#@ touch $@
5151
endif
5252

5353
.cache:

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
mkdocs==1.3.0; python_version >= "3.6"
1+
mkdocs==1.4.2; python_version >= "3.7"
22
pygments==2.14.0; python_version >= "3.6"

0 commit comments

Comments
 (0)