← Back to team overview

wordpress-charmers team mailing list archive

Re: [Merge] ~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress:master into charm-k8s-wordpress:master

 

Let's switch to using tox targets for lint

Diff comments:

> diff --git a/Makefile b/Makefile
> index 6dc2159..3891e12 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2,5 +2,20 @@ lint:
>  	black -l 120 -t py37 reactive/
>  	flake8 reactive/

Since you've got tox targets for this now, let's switch to them (this will avoid needing to install black and flake8 locally and ensure we're only defining the configs for those once):

lint:
    @echo "Normalising python layout with black."
    @tox -e black
    @echo "Running flake8"
    @tox -e lint

>  
> +unittest:
> +	@tox -e unit
> +
> +test: lint unittest
> +
>  build: lint
>  	charm build
> +
> +clean:
> +	@echo "Cleaning files"
> +	@rm -rf ./.tox
> +	@rm -rf ./.pytest_cache
> +	@rm -rf ./tests/unit/__pycache__ ./reactive/__pycache__ ./lib/__pycache__
> +	@rm -rf ./.coverage ./.unit-state.db
> +
> +
> +.PHONY: lint test unittest build clean


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


References