Skip to content

Commit 0b6195c

Browse files
committed
Merge branch 'template'
2 parents be8dab8 + 809c45d commit 0b6195c

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

.cookiecutter.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"_dest_dir": "worktree",
3+
"_setuptools_scm_root": "",
34
"_template": "../cookiecutter-python-cli",
45
"_template_name": "cookiecutter-python-cli",
56
"author_email": "[email protected]",

.github/workflows/check.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
with:
7373
linters: pytest
7474
run: make test-pytest
75-
- name: cram, readme
76-
run: make test-cram readme
75+
- name: prysk, readme
76+
run: make test-prysk readme
7777
- name: check-wheel
7878
run: make check-wheel
7979

@@ -140,7 +140,7 @@ jobs:
140140
with:
141141
linters: pytest
142142
run: make test-pytest
143-
- name: cram, readme
143+
- name: prysk, readme
144144
run: make readme
145145
- name: check-wheel
146146
run: make check-wheel

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ lint-isort: $(VENV_DONE)
5151
$(VENV_PYTHON) -m isort --check $(LINT_SOURCES)
5252

5353
.PHONY: test
54-
test: test-pytest test-cram
54+
test: test-pytest test-prysk
5555

5656
.PHONY: test-pytest
5757
test-pytest: $(VENV_DONE)
@@ -61,17 +61,17 @@ test-pytest: $(VENV_DONE)
6161
readme: README.md
6262
git diff --exit-code $^
6363

64-
.PHONY: test-cram
65-
test-cram: CRAM_INTERACTIVE=$(shell [ -t 0 ] && echo --interactive)
66-
test-cram: $(VENV_DONE)
64+
.PHONY: test-prysk
65+
test-prysk: PRYSK_INTERACTIVE=$(shell [ -t 0 ] && echo --interactive)
66+
test-prysk: $(VENV_DONE)
6767
PATH="$(CURDIR)/$(VENV)/bin:$$PATH" \
6868
XDG_DATA_HOME=/home/user/.local/share \
6969
XDG_CONFIG_HOME=/home/user/.config \
70-
$(VENV_PYTHON) tests/cram-noescape.py --indent=4 --shell=/bin/bash $(CRAM_INTERACTIVE) \
70+
$(VENV_PYTHON) tests/prysk-noescape.py --indent=4 --shell=/bin/bash $(PRYSK_INTERACTIVE) \
7171
$(wildcard tests/*.md tests/*/*.md tests/*/*/*.md)
7272

7373
.PHONY: README.md
74-
README.md: test-cram
74+
README.md: test-prysk
7575
tests/include.py < $@ > $@.tmp
7676
mv -f $@.tmp $@
7777

pyproject.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ dependencies = [
3838
[project.optional-dependencies]
3939
dev = [
4040
"build >= 0.7",
41-
"cram",
4241
"flake8 >= 3.7",
4342
"isort >= 5.0",
4443
"mypy >= 0.900",
44+
"prysk == 0.16.0",
4545
"twine",
4646
"types-PyYAML",
4747
"types-python-dateutil",
@@ -73,7 +73,6 @@ dependencies-apt = [
7373
"python3-click",
7474
"python3-click-option-group",
7575
"python3-configobj",
76-
"python3-cram",
7776
"python3-dateutil",
7877
"python3-flake8",
7978
"python3-importlib-metadata",

tests/cram-noescape.py

-8
This file was deleted.

tests/prysk-noescape.py

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env python3
2+
3+
from pathlib import Path
4+
import runpy
5+
6+
import prysk.test # type: ignore [import]
7+
8+
prysk.test._IS_ESCAPING_NEEDED = lambda _: False
9+
prysk.test._findtests = lambda paths: map(Path, paths) # https://github.com/prysk/prysk/issues/224
10+
runpy.run_module('prysk')

0 commit comments

Comments
 (0)