From 5924633bc939f3eb0d943feb6547124db121c22d Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Mon, 14 Feb 2022 09:44:24 +0100 Subject: [PATCH] make clean now utilizes docker --- Makefile | 22 ++-------------------- docker-compose.yml | 8 +++++++- scripts/clean.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 21 deletions(-) create mode 100755 scripts/clean.sh diff --git a/Makefile b/Makefile index b0b87b6..71afc60 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,8 @@ doc-acceptance: check-deps ## Create documentation for acceptance tests @$(DC) run --rm python-acceptance pycco -i -s /src -d /docs $(BROWSER) acceptance/python/docs/index.html -clean: clean-build clean-pyc clean-test ## Remove all build, test, coverage and Python artifacts +clean: check-deps ## Remove all build, test, coverage and Python artifacts + @$(DC) up clean @$(ECHO) "Cleaning was successful." reset: check-deps ## Stop and REMOVE all containers. WARNING: you will LOSE all data stored in Planetmint. @@ -129,22 +130,3 @@ ifndef IS_DOCKER_COMPOSE_INSTALLED @$(ECHO) @$(DC) # docker-compose is not installed, so we call it to generate an error and exit endif - -clean-build: # Remove build artifacts - @rm -fr build/ - @rm -fr dist/ - @rm -fr .eggs/ - @find . -name '*.egg-info' -exec rm -fr {} + - @find . -name '*.egg' -exec rm -f {} + - -clean-pyc: # Remove Python file artifacts - @find . -name '*.pyc' -exec rm -f {} + - @find . -name '*.pyo' -exec rm -f {} + - @find . -name '*~' -exec rm -f {} + - @find . -name '__pycache__' -exec rm -fr {} + - -clean-test: # Remove test and coverage artifacts - @find . -name '.pytest_cache' -exec rm -fr {} + - @rm -fr .tox/ - @rm -f .coverage - @rm -fr htmlcov/ diff --git a/docker-compose.yml b/docker-compose.yml index d5936c6..b62487b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,4 +123,10 @@ services: - ./planetmint:/planetmint - ./acceptance:/acceptance - ./integration:/integration - - ./tests:/tests \ No newline at end of file + - ./tests:/tests + + clean: + image: alpine + command: /bin/sh -c "./planetmint/scripts/clean.sh" + volumes: + - $PWD:/planetmint \ No newline at end of file diff --git a/scripts/clean.sh b/scripts/clean.sh new file mode 100755 index 0000000..a047442 --- /dev/null +++ b/scripts/clean.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright © 2020 Interplanetary Database Association e.V., +# Planetmint and IPDB software contributors. +# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0) +# Code is Apache-2.0 and docs are CC-BY-4.0 + +cd planetmint + +# Remove build artifacts +rm -fr build/ +rm -fr dist/ +rm -fr .eggs/ +find . -name '*.egg-info' -exec rm -fr {} + +find . -name '*.egg' -type f -exec rm -f {} + + +# Remove Python file artifacts +find . -name '*.pyc' -exec rm -f {} + +find . -name '*.pyo' -exec rm -f {} + +find . -name '*~' -exec rm -f {} + +find . -name '__pycache__' -exec rm -fr {} + + +# Remove test and coverage artifacts +find . -name '.pytest_cache' -exec rm -fr {} + +rm -fr .tox/ +rm -f .coverage +rm -fr htmlcov/ \ No newline at end of file