Merge branch 'master' into build_target_children

.github/workflows/ci.yml

@@ -24,10 +24,9 @@ jobs:
           - '3.9'
           - '3.10'
           - '3.11'
-        continue-on-error:
-          - false
+          - '3.12'
     runs-on: "${{ matrix.os }}"
-    continue-on-error: "${{ matrix.continue-on-error }}"
+    continue-on-error: false
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

.gitignore

@@ -79,7 +79,7 @@ celerybeat-schedule
 
 # Environments
 .env
-.venv
+.venv*
 env/
 venv/
 ENV/

HISTORY.md

@@ -1,5 +1,41 @@
 # Release History
 
+## 1.25.0
+
+* Allow passing multiple file names to graph, to get multiple lines in HTML by @devdanzin in https://github.com/tonybaloney/wily/pull/206
+* Test support for Python 3.12 by @tonybaloney in https://github.com/tonybaloney/wily/pull/224
+* Add line numbers for metrics in Cyclomatic and Halstead operators by @devdanzin in https://github.com/tonybaloney/wily/pull/218
+* Standalone plotly.min.js for graph (fix #189) by @devdanzin in https://github.com/tonybaloney/wily/pull/209
+* Use class/function names for metric_type and aggregate in list-metrics by @devdanzin in https://github.com/tonybaloney/wily/pull/213
+
+### Bugfixes and minor updates
+
+* Use ruff to replace bandit, flake8 and plugins, isort, pydocstyle, pyupgrade by @cclauss in https://github.com/tonybaloney/wily/pull/174
+* ruff recommended code changes from #174 by @cclauss in https://github.com/tonybaloney/wily/pull/175
+* Use xmlcharrefreplace to handle codec errors in html report writing (fix #182) by @devdanzin in https://github.com/tonybaloney/wily/pull/183
+* HTML report: replace ESCAPE character (fix #184) by @devdanzin in https://github.com/tonybaloney/wily/pull/185
+* Allow report to only display revisions that have changes (fix #187) by @devdanzin in https://github.com/tonybaloney/wily/pull/188
+* Fix ruff CI checks by @devdanzin in https://github.com/tonybaloney/wily/pull/195
+* Fix creating graphs for directories in Windows (fix #190) by @devdanzin in https://github.com/tonybaloney/wily/pull/191
+* Avoid statistics.StatisticsError if rank finds no data (fix #196) by @devdanzin in https://github.com/tonybaloney/wily/pull/197
+* Avoid using unicode characters if `sys.stdout` doesn't support them (fix #65) by @devdanzin in https://github.com/tonybaloney/wily/pull/200
+* Fix some docstrings by @devdanzin in https://github.com/tonybaloney/wily/pull/198
+* Fix graph not displaying filenames as line labels by @devdanzin in https://github.com/tonybaloney/wily/pull/202
+* Avoid report erroring out if there is no data to show by @devdanzin in https://github.com/tonybaloney/wily/pull/203
+* Allow output from commands to be wrapped to terminal width (fix #81) by @devdanzin in https://github.com/tonybaloney/wily/pull/201
+* Handle sys.stdout.encoding being None in get_style() by @devdanzin in https://github.com/tonybaloney/wily/pull/204
+* Annotate core functions and remove sphinx style argument types by @tonybaloney in https://github.com/tonybaloney/wily/pull/205
+* Fix ruff error due to use of .format() in diff.py by @devdanzin in https://github.com/tonybaloney/wily/pull/207
+* Fix HTML report table not being scrollable (fix #186) by @devdanzin in https://github.com/tonybaloney/wily/pull/208
+* Delete unused, untested decorators.py by @devdanzin in https://github.com/tonybaloney/wily/pull/212
+* Fix aggregation in Windows (fix #210) by @devdanzin in https://github.com/tonybaloney/wily/pull/211
+* Restore displaying graph markers by @devdanzin in https://github.com/tonybaloney/wily/pull/215
+* Update graph and report documentation by @devdanzin in https://github.com/tonybaloney/wily/pull/216
+* Lazy-format all logging calls (fix #219) by @devdanzin in https://github.com/tonybaloney/wily/pull/220
+* Add some more typing by @devdanzin in https://github.com/tonybaloney/wily/pull/221
+* Add unit tests for some commands by @devdanzin in https://github.com/tonybaloney/wily/pull/199
+* Fix typing of tests and make pyright check them on CI by @devdanzin in https://github.com/tonybaloney/wily/pull/222
+
 ## 1.24.0 (20th October 2022)
 
 * refactor: apply black on wily codebase by @skarzi in https://github.com/tonybaloney/wily/pull/162

README.md

@@ -3,10 +3,9 @@
 A command-line application for tracking, reporting on complexity of Python tests and applications.
 
 [![Wily](https://img.shields.io/badge/%F0%9F%A6%8A%20wily-passing-brightgreen.svg)](https://wily.readthedocs.io/)
-[![codecov](https://codecov.io/gh/tonybaloney/wily/branch/master/graph/badge.svg)](https://codecov.io/gh/tonybaloney/wily) [![Documentation Status](https://readthedocs.org/projects/wily/badge/?version=latest)](https://wily.readthedocs.io/en/latest/?badge=latest) [![PyPI version](https://badge.fury.io/py/wily.svg)](https://badge.fury.io/py/wily) [![Conda Version](https://img.shields.io/conda/vn/conda-forge/wily.svg)](https://anaconda.org/conda-forge/wily) ![black](https://img.shields.io/badge/code%20style-black-000000.svg)
+[![codecov](https://codecov.io/gh/tonybaloney/wily/branch/master/graph/badge.svg)](https://codecov.io/gh/tonybaloney/wily) [![Documentation Status](https://readthedocs.org/projects/wily/badge/?version=latest)](https://wily.readthedocs.io/en/latest/?badge=latest) [![PyPI version](https://badge.fury.io/py/wily.svg)](https://badge.fury.io/py/wily) [![Conda Version](https://img.shields.io/conda/vn/conda-forge/wily.svg)](https://anaconda.org/conda-forge/wily) ![black](https://img.shields.io/badge/code%20style-black-000000.svg) ![PyPI - Downloads](https://img.shields.io/pypi/dm/wily)
 
-
-```
+```default
 wily [a]:
 quick to think of things, having a very good understanding of situations and possibilities, 
 and often willing to use tricks to achieve an aim.
@@ -42,7 +41,7 @@ Wily can be used via a command line interface, `wily`.
 
 ## Demo
 
-Here is a demo of wily analysing a Python project, giving a summary of changes to complexity in the last 10 commits and then showing changes against a specific git revision: 
+Here is a demo of wily analysing a Python project, giving a summary of changes to complexity in the last 10 commits and then showing changes against a specific git revision:
 
 ![demo](./docs/source/_static/termtosvg_leo0ur6s.svg)
 
@@ -86,7 +85,7 @@ repos:
 
 The first step to using `wily` is to build a wily cache with the statistics of your project. 
 
-```
+```default
 Usage: __main__.py build [OPTIONS] [TARGETS]...
 
   Build the wily cache
@@ -108,7 +107,6 @@ Limit the number of revisions (defaults to 50).
 
 ![wily-build](https://github.com/tonybaloney/wily/raw/master/docs/source/_static/wily_build.png)
 
-
 #### `wily report`
 
 Show a specific metric for a given file, requires that `.wily/` exists
@@ -139,7 +137,6 @@ Show information about the build directory. Requires that `.wily/` exists.
 
 ![wily-graph](https://github.com/tonybaloney/wily/raw/master/docs/source/_static/wily_index.png)
 
-
 ### `wily list-metrics`
 
 List the metrics available in the Wily operators. Each one of the metrics can be used in `wily graph` and `wily report`
@@ -203,7 +200,6 @@ Wily will detect and scan all Python code in .ipynb files automatically.
 You can disable this behaviour if you require by setting `ipynb_support = false` in the configuration.
 You can also disable the behaviour of reporting on individual cells by setting `ipynb_cells = false`.
 
-
 # Credits
 
 ## Contributors

pyproject.toml

@@ -18,6 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [

src/wily/__init__.py

@@ -42,7 +42,7 @@
 
 import colorlog
 
-__version__ = "1.24.2"
+__version__ = "1.25.0"
 
 _, WILY_LOG_NAME = tempfile.mkstemp(suffix="wily_log")
 

test/integration/test_build.py

@@ -89,7 +89,7 @@ def test_build_crash(tmpdir):
     ) as bar_finish:
         runner = CliRunner()
         result = runner.invoke(main.cli, ["--path", tmpdir, "build", "test.py"])
-        assert bar_finish.called_once
+        assert bar_finish.called
         assert result.exit_code == 1, result.stdout