Skip to content

Commit

Permalink
Remove local install python in favour of hdev and fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Betts committed Jun 4, 2021
1 parent f87c9df commit 627f565
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 61 deletions.
3 changes: 2 additions & 1 deletion .cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"README.md",
"setup.cfg",
"pytest.ini",
"src/pyramid_sanity/__init__.py"
"src/pyramid_sanity/__init__.py",
"tests/conftest.py"
]
},
"_template": "gh:hypothesis/h-cookiecutter-pypackage"
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ coverage: python

.PHONY: python
python:
@./bin/install-python.sh
@# Ensure we can run even if the local pyenv versions are not installed
@PYENV_VERSION=system hdev install-python;
58 changes: 0 additions & 58 deletions bin/install-python.sh

This file was deleted.

5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[tool.hdev.tox]
# Any pip dependencies to be run before every test run (is prepended with
# "pip install") or false if no extras are required.
# e.g. flask=1.2.3 --no-deps
test_extras = false
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ passenv =
EXTRA_DEPS
dist: BUILD
deps =
{tests,lint}: .[tests]
{tests,lint}: -e .[tests]
lint: pylint
lint: pydocstyle
{checkformatting,format}: black
Expand All @@ -29,11 +29,13 @@ deps =
{dist,initialrelease}: wheel
{env:EXTRA_DEPS:}
whitelist_externals =
hdev
release: {toxinidir}/bin/check_that_git_working_tree_is_clean.sh
{dist,initialrelease}: rm
{release,initialrelease}: sh
{release,initialrelease}: git
commands =
tests: hdev config --if tool.hdev.tox.test_extras --run --template "pip install --quiet --use-feature=in-tree-build \{0\}"
tests: coverage run -m pytest tests

lint: pydocstyle --explain src
Expand Down

0 comments on commit 627f565

Please sign in to comment.