Merge pull request #593 from doorstop-dev/drop-3.7

Drop support for Python 3.7

.github/workflows/execute-tests.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.8", "3.9", "3.10"]
     name: Python ${{ matrix.python-version }}
 
     defaults:

.pylint.ini

@@ -52,54 +52,6 @@ confidence=
 # --disable=W"
 
 disable=
-    print-statement,
-    parameter-unpacking,
-    unpacking-in-except,
-    old-raise-syntax,
-    backtick,
-    import-star-module-level,
-    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,
-    long-suffix,
-    old-ne-operator,
-    old-octal-literal,
     suppressed-message,
     useless-suppression,
     locally-disabled,
@@ -125,7 +77,6 @@ disable=
     duplicate-code,
     unpacking-non-sequence,
     ungrouped-imports,
-    bad-continuation,
     superfluous-parens,
     unsubscriptable-object,
     consider-using-f-string,
@@ -134,6 +85,8 @@ disable=
     unnecessary-comprehension,
     consider-using-with,
     logging-fstring-interpolation,
+    unnecessary-dunder-call,
+    deprecated-module,
 
 # 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
@@ -175,70 +128,40 @@ 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_]*))$
 
 # Good variable names which should always be accepted, separated by a comma
 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]+))$
 
@@ -254,9 +177,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_]*))$
 
@@ -282,12 +202,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

.verchew.ini

@@ -6,7 +6,7 @@ version = GNU Make
 [Python]
 
 cli = python
-version = 3.7 || 3.8 || 3.9
+version = 3.8 || 3.9 || 3.10
 
 [Poetry]
 
@@ -17,6 +17,6 @@ version = 1
 
 cli = dot
 cli_version_arg = -V
-version = 2
+version = 7
 optional = true
 message = This is only needed to generate UML diagrams for documentation.

.vscode/settings.json

@@ -3,7 +3,7 @@
     ".cache/": true,
     ".venv/": true,
     "*.egg-info": true,
-    "**/__pycache__": true,
+    "**/__pycache__": true
   },
   "python.linting.enabled": true,
   "python.linting.pylintEnabled": true,
@@ -24,21 +24,33 @@
     "curr",
     "cust",
     "doorhole",
+    "dunder",
+    "endfirsthead",
+    "endfoot",
+    "endhead",
+    "endlastfoot",
+    "enduml",
     "evalue",
     "EXTS",
     "Gitter",
     "graphviz",
+    "HLINE",
+    "hyperref",
     "itered",
     "lgpl",
+    "LINESEPERATOR",
     "linkify",
+    "LONGTABLE",
     "mkdir",
     "mockvcs",
+    "mylevel",
     "nlev",
     "nlevel",
     "nuid",
     "nums",
     "openpyxl",
     "pids",
+    "plantuml",
     "plev",
     "plevel",
     "puid",
@@ -47,6 +59,8 @@
     "sargs",
     "sgignores",
     "spdx",
+    "textit",
+    "textwidth",
     "tkinter",
     "UID's",
     "uids",
@@ -58,6 +72,5 @@
     "workpath",
     "xlsx",
     "yamlfile"
-  ],
-
+  ]
 }

CHANGELOG.md

@@ -1,6 +1,6 @@
 # 3.0 (beta)
 
-- **BREAKING:** Dropped support for Python 3.6.
+- **BREAKING:** Dropped support for Python 3.6 and 3.7.
 - **BREAKING:** Removed `--no-body-levels` option to `doorstop publish`.
 - Fixed overriding default attributes with `doorstop add`. ([@tangoalx](https://github.com/doorstop-dev/doorstop/pull/544))
 - Fixed encoding error with special characters on Windows. ([@urbasus](https://github.com/doorstop-dev/doorstop/pull/526))

Makefile

@@ -13,10 +13,7 @@ VIRTUAL_ENV ?= .venv
 # MAIN TASKS ##################################################################
 
 .PHONY: all
-all: install
-
-.PHONY: ci
-ci: format check test mkdocs demo ## Run all tasks that determine CI status
+all: doctor format check test mkdocs demo ## Run all tasks that determine CI status
 
 .PHONY: dev
 dev: install .clean-test ## Continuously run all CI tasks when files chanage
@@ -256,7 +253,7 @@ clean-all: clean
 # HELP ########################################################################
 
 .PHONY: help
-help: all
+help: install
 	@ grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .DEFAULT_GOAL := help

README.md

@@ -1,6 +1,6 @@
-[![Linux Test](https://github.com/doorstop-dev/doorstop/actions/workflows/test-linux.yml/badge.svg)](https://github.com/doorstop-dev/doorstop/actions/workflows/test-linux.yml)
-[![Mac OS X Test](https://github.com/doorstop-dev/doorstop/actions/workflows/test-osx.yml/badge.svg)](https://github.com/doorstop-dev/doorstop/actions/workflows/test-osx.yml)
-[![Windows Test](https://github.com/doorstop-dev/doorstop/actions/workflows/test-windows.yml/badge.svg)](https://github.com/doorstop-dev/doorstop/actions/workflows/test-windows.yml)
+[![Linux Tests](https://github.com/doorstop-dev/doorstop/actions/workflows/test-linux.yml/badge.svg)](https://github.com/doorstop-dev/doorstop/actions/workflows/test-linux.yml)
+[![macOS Tests](https://github.com/doorstop-dev/doorstop/actions/workflows/test-osx.yml/badge.svg)](https://github.com/doorstop-dev/doorstop/actions/workflows/test-osx.yml)
+[![Windows Tests](https://github.com/doorstop-dev/doorstop/actions/workflows/test-windows.yml/badge.svg)](https://github.com/doorstop-dev/doorstop/actions/workflows/test-windows.yml)
 <br>
 [![Coverage Status](https://img.shields.io/codecov/c/gh/doorstop-dev/doorstop)](https://codecov.io/gh/doorstop-dev/doorstop)
 [![Scrutinizer Code Quality](http://img.shields.io/scrutinizer/g/doorstop-dev/doorstop.svg)](https://scrutinizer-ci.com/g/doorstop-dev/doorstop/?branch=develop)
@@ -27,13 +27,12 @@ Additional references:
 - talks: [GRDevDay](https://speakerdeck.com/jacebrowning/doorstop-requirements-management-using-python-and-version-control), [BarCamp](https://speakerdeck.com/jacebrowning/strip-searched-a-rough-introduction-to-requirements-management)
 - sample: [Generated HTML](http://doorstop-dev.github.io/doorstop/)
 
-
 # Setup
 
 ## Requirements
 
-* Python 3.7+
-* A version control system for requirements storage
+- Python 3.8+
+- A version control system for requirements storage
 
 ## Installation
 

docs/gui/overview.md

@@ -12,6 +12,4 @@ A window similar to the following should appear:
 
 If you're interested in helping finish this UI, please check out the [relevant open issues](https://github.com/doorstop-dev/doorstop/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+gui) on GitHub.
 
-# Mac OS X
-To use the GUI on Mac OS X you fist have to install python-tk.
-`brew install python-tk`
+NOTE: You may need to run `brew install python-tk` first on macOS.