Skip to content

Commit f512075

Browse files
committed
Fix pytest related test and coverage script generation bugs introduced in 1.2.1. Fix pyrefly domain.
1 parent aa69bde commit f512075

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
- published
1111
workflow_dispatch:
1212

13-
1413
jobs:
1514
tests:
1615
uses: "./.github/workflows/test.yml"
@@ -90,4 +89,4 @@
9089
docs:
9190
needs:
9291
- release-pypi
93-
uses: "./.github/workflows/docs.yml"
92+
uses: "./.github/workflows/docs.yml"

CHANGES.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
# Changelog
22

3+
## 1.2.2 (2025-06-30)
4+
5+
- Fix `pyrefly` domain.
6+
7+
- Fix pytest related test and coverage script generation bugs introduced in 1.2.1.
8+
39
## 1.2.1 (2025-06-23)
410

511
- Fix test-script to not end with backslash if there is no `testpaths` (which is valid).
612
Improve tests to cover more edge cases, i.e. above and multi-line.
13+
714
- Fix Python check for global UV and use PRIMARY_PYTHON for UV as version definition.
15+
816
- Improve test to read large amount of output from file (Makefile template check).
917

1018
## 1.2.0 (2025-06-04)
1119

12-
- add pyrefly type checker support
13-
20+
- add `pyrefly` type checker support.
1421

1522
## 1.1.0 (2025-03-20)
1623

@@ -27,13 +34,10 @@
2734
- Fix `zope.mk`, wrong config file was passed to zconsole.
2835
Now zope-debug and zope-runscript are functional.
2936

30-
3137
## 1.0a8 (2024-10-24)
3238

33-
3439
- Fix preseed value reading.
3540

36-
3741
## 1.0a7 (2024-10-24)
3842

3943
- Add proxy target support.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[project]
22
name = "mxmake"
33
description = "Generates a Python project-specific Makefile by using an extensible library of configurable Makefile snippets."
4-
version = "1.2.1"
4+
version = "1.2.2"
55
keywords = ["development", "deployment", "make"]
66
authors = [
77
{name = "MX Stack Developers", email = "dev@bluedynamics.com" }

src/mxmake/templates/pytest-run-coverage.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ coverage run \
2626
{% if omitpaths %}
2727
--omit=$omits \
2828
{% endif %}
29-
-m pytest {% if testpaths %}\{% endif %}
29+
-m pytest{% if testpaths %} \{% endif +%}
3030
{% for path in testpaths %}
31-
{{ path }}{% if not loop.last %} \{% endif %}
32-
31+
{{ path }}{% if not loop.last %} \{% endif +%}
3332
{% endfor %}
3433

3534
coverage report
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{% extends "env.sh" %}
22

33
{% block env_content %}
4-
pytest {% if testpaths %}\{%+ endif +%}
4+
pytest{% if testpaths %} \{% endif +%}
55
{% for path in testpaths %}
6-
{{ path }}{% if not loop.last %} \ {%+ endif +%}
7-
6+
{{ path }}{% if not loop.last %} \{% endif +%}
87
{% endfor %}
98

109
{% endblock %}

src/mxmake/topics/qa/pyrefly.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#:
99
#:[setting.PYREFLY_SRC]
1010
#:description = Source folder for code analysis. Left empty to use value from pyproject.toml
11-
#:default = src/**
11+
#:default = src
1212
#:
1313
#:[setting.PYREFLY_REQUIREMENTS]
1414
#:description = Python requirements to be installed (via pip).
@@ -33,7 +33,7 @@ $(PYREFLY_TARGET): $(MXENV_TARGET)
3333
.PHONY: pyrefly
3434
pyrefly: $(PACKAGES_TARGET) $(PYREFLY_TARGET)
3535
@echo "Run pyrefly"
36-
@pyrefly $(PYREFLY_SRC)
36+
@pyrefly check $(PYREFLY_SRC)
3737

3838
.PHONY: pyrefly-dirty
3939
pyrefly-dirty:
@@ -44,6 +44,6 @@ pyrefly-clean: pyrefly-dirty
4444
@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y pyrefly || :
4545

4646
INSTALL_TARGETS+=$(PYREFLY_TARGET)
47-
CHECK_TARGETS+=pyrefly-check
47+
CHECK_TARGETS+=pyrefly
4848
CLEAN_TARGETS+=pyrefly-clean
4949
DIRTY_TARGETS+=pyrefly-dirty

0 commit comments

Comments
 (0)