wordpress-charmers team mailing list archive

[Tom Haddon <tom.haddon@xxxxxxxxxxxxx>]

Let's update it from /tmp/.tox to minimise possible collisions

Diff comments:

> diff --git a/Makefile b/Makefile
> index cf18918..a4853e1 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,16 +1,24 @@
> -lint:
> +format:
>  	@echo "Normalising python layout with black."
>  	@tox -e black
> +
> +lint:
>  	@echo "Running flake8"
>  	@tox -e lint
>  
> +integration:
> +	@echo "Running integration"
> +	@export WORKSPACE=${WORKSPACE}
> +	@tox -e integration
> +
>  unittest:
>  	@tox -e unit
>  
> -test: lint unittest
> +test: lint unittest clean
>  
>  clean:
>  	@echo "Cleaning files"
> -	@git clean -fXd
> +	@git clean -fXd || true
> +	@rm -r /tmp/.tox

can we use /tmp/charm-k8s-wordpress/.tox pls?

>  
> -.PHONY: lint test unittest clean
> +.PHONY: format lint test unittest integration clean
> diff --git a/tox.ini b/tox.ini
> index dbbb20f..b6528b2 100644
> --- a/tox.ini
> +++ b/tox.ini
> @@ -1,16 +1,20 @@
>  [tox]
>  skipsdist=True
> -envlist = unit, functional
> +envlist = unit, integration
>  skip_missing_interpreters = True
> +toxworkdir=/tmp/.tox

This will need updating too.

>  
>  [testenv]
>  basepython = python3
>  setenv =
>    PYTHONPATH = .
> +passenv =
> +  WORKSPACE
> +
>  
>  [testenv:unit]
>  commands =
> -    pytest --ignore mod --ignore {toxinidir}/tests/functional \
> +    pytest --ignore mod --ignore {toxinidir}/tests/integration \
>        {posargs:-v  --cov=src --cov-report=term-missing --cov-branch}
>  deps = -r{toxinidir}/tests/unit/requirements.txt
>         -r{toxinidir}/requirements.txt


-- 
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/386800
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress/+git/charm-k8s-wordpress:wordpress_plugin_integration into charm-k8s-wordpress:master.