Skip to content

Commit

Permalink
Merge d6f6a1e into e764302
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed Nov 23, 2022
2 parents e764302 + d6f6a1e commit 27cd5e7
Show file tree
Hide file tree
Showing 11 changed files with 165 additions and 306 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Expand Up @@ -18,7 +18,7 @@ install:
- set PATH=C:\Python%PYTHON_MAJOR%%PYTHON_MINOR%\Scripts;%PATH%
# Install system dependencies
- curl -sSL https://install.python-poetry.org | python -
- set PATH=C:\Users\appveyor\AppData\Roaming\Python\Scripts;%PATH%
- set PATH=%USERPROFILE%\AppData\Roaming\Python\Scripts;%PATH%
- make doctor
# Install project dependencies
- make install
Expand Down
128 changes: 18 additions & 110 deletions .pylint.ini
Expand Up @@ -51,84 +51,28 @@ confidence=
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=
print-statement,
parameter-unpacking,
unpacking-in-except,
old-raise-syntax,
backtick,
long-suffix,
old-ne-operator,
old-octal-literal,
import-star-module-level,
raw-checker-failed,
bad-inline-option,
locally-disabled,
locally-enabled,
file-ignored,
suppressed-message,
useless-suppression,
deprecated-pragma,
apply-builtin,
basestring-builtin,
buffer-builtin,
cmp-builtin,
coerce-builtin,
execfile-builtin,
file-builtin,
long-builtin,
raw_input-builtin,
reduce-builtin,
standarderror-builtin,
unicode-builtin,
xrange-builtin,
coerce-method,
delslice-method,
getslice-method,
setslice-method,
no-absolute-import,
old-division,
dict-iter-method,
dict-view-method,
next-method-called,
metaclass-assignment,
indexing-exception,
raising-string,
reload-builtin,
oct-method,
hex-method,
nonzero-method,
cmp-method,
input-builtin,
round-builtin,
intern-builtin,
unichr-builtin,
map-builtin-not-iterating,
zip-builtin-not-iterating,
range-builtin-not-iterating,
filter-builtin-not-iterating,
using-cmp-argument,
eq-without-hash,
div-method,
idiv-method,
rdiv-method,
exception-message-attribute,
invalid-str-codec,
sys-max-int,
bad-python3-import,
deprecated-string-function,
deprecated-str-translate-call,
missing-docstring,
fixme,
global-statement,
invalid-name,
missing-docstring,
redefined-outer-name,
too-few-public-methods,
fixme,
too-many-locals,
too-many-arguments,
unnecessary-pass,
broad-except,
duplicate-code,
too-many-branches,
unpacking-non-sequence,
wildcard-import,
unused-wildcard-import,
singleton-comparison,
bad-continuation,
wrong-import-order,
too-many-return-statements,
too-many-public-methods,
too-many-ancestors,
too-many-instance-attributes,
too-many-statements,
attribute-defined-outside-init,
unsupported-assignment-operation,
unsupported-delete-operation,
too-many-nested-blocks,
protected-access,

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down Expand Up @@ -170,46 +114,28 @@ max-nested-blocks=5

[BASIC]

# Naming hint for argument names
argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct argument names
argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Naming hint for attribute names
attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct attribute names
attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

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

# Naming hint for class attribute names
class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$

# Regular expression matching correct class attribute names
class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$

# Naming hint for class names
class-name-hint=[A-Z_][a-zA-Z0-9]+$

# Regular expression matching correct class names
class-rgx=[A-Z_][a-zA-Z0-9]+$

# Naming hint for constant names
const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$

# Regular expression matching correct constant names
const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$

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

# Naming hint for function names
function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct function names
function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

Expand All @@ -219,21 +145,12 @@ good-names=i,j,k,ex,Run,_
# Include a hint for the correct naming format with invalid-name
include-naming-hint=no

# Naming hint for inline iteration names
inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$

# Regular expression matching correct inline iteration names
inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$

# Naming hint for method names
method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct method names
method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Naming hint for module names
module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$

# Regular expression matching correct module names
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$

Expand All @@ -249,9 +166,6 @@ no-docstring-rgx=^_
# to this list to register other decorators that produce valid properties.
property-classes=abc.abstractproperty

# Naming hint for variable names
variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Regular expression matching correct variable names
variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

Expand All @@ -277,12 +191,6 @@ max-line-length=88
# Maximum number of lines in a module
max-module-lines=1000

# List of optional constructs for which whitespace checking is disabled. `dict-
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
# `empty-line` allows space-only lines.
no-space-check=trailing-comma,dict-separator

# Allow the body of a class to be on the same line as the declaration if body
# contains single statement.
single-line-class-stmt=no
Expand Down
2 changes: 1 addition & 1 deletion .python-version
@@ -1 +1 @@
3.7.5
3.10.8
11 changes: 5 additions & 6 deletions .travis.yml
@@ -1,10 +1,10 @@
dist: xenial
dist: focal

language: python
python:
- 3.7
- 3.8
- 3.9
- "3.8"
- "3.9"
- "3.10"

cache:
pip: true
Expand All @@ -16,8 +16,7 @@ env:
- RANDOM_SEED=0

before_install:
- curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
- source $HOME/.poetry/env
- curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
- make doctor

install:
Expand Down
2 changes: 2 additions & 0 deletions .vscode/settings.json
@@ -1,6 +1,8 @@
{
"cSpell.words": [
"caplog",
"coveragerc",
"freezegun",
"minilog",
"minimalistic",
"sinfo",
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
# Release Notes

## 2.2 (beta)

- Dropped support for Python 3.7.

## 2.1 (2022-03-06)

- Dropped support for Python 3.6.
Expand Down
1 change: 0 additions & 1 deletion Makefile
Expand Up @@ -72,7 +72,6 @@ endif
RANDOM_SEED ?= $(shell date +%s)
FAILURES := .cache/pytest/v/cache/lastfailed

PYTEST_OPTIONS := --random --random-seed=$(RANDOM_SEED)
ifndef DISABLE_COVERAGE
PYTEST_OPTIONS += --cov=$(PACKAGE)
endif
Expand Down
8 changes: 4 additions & 4 deletions bin/update
Expand Up @@ -49,6 +49,10 @@ def run():

def copy():
for filename in [
os.path.join('bin', 'update'),
os.path.join('bin', 'checksum'),
os.path.join('bin', 'open'),
os.path.join('bin', 'verchew'),
'.appveyor.yml',
'.coveragerc',
'.gitattributes',
Expand All @@ -59,10 +63,6 @@ def copy():
'.verchew.ini',
'CONTRIBUTING.md',
'Makefile',
os.path.join('bin', 'checksum'),
os.path.join('bin', 'open'),
os.path.join('bin', 'update'),
os.path.join('bin', 'verchew'),
'scent.py',
]:
src = os.path.join(TMP, CONFIG['project_name'], filename)
Expand Down

0 comments on commit 27cd5e7

Please sign in to comment.