Skip to content

refactor(Makefile): Cleanup variables #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bigcat88 merged 4 commits into from
Jun 10, 2024
Merged

refactor(Makefile): Cleanup variables #1367

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17ca5ee
refactor(Makefile): Cleanup variables
provokateurin Apr 29, 2024
9f2e7b1
fixup: Adjust one missing variable (poetry_run)
joshtrichards Jun 9, 2024
bea6f8c
Merge branch 'master' into refactor/makefile/cleanup
bigcat88 Jun 10, 2024
200f67e
returned "db" variable back
bigcat88 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
poetry=poetry
poetry_run=$(poetry) run
python=$(poetry_run) python
pyresttest=$(poetry_run) pyresttest
coverage=$(poetry_run) coverage
manage-script=$(CURDIR)/manage.py
manage=$(poetry_run) $(manage-script)
manage=poetry run $(manage-script)
db=sqlite
Copy link
Member

@bigcat88 bigcat88 Jun 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please return "$db" variable, it is used in tests. except these all other changes are good

npm=npm
prod_version=27.0.0

.PHONY: test
test:
$(npm) test
$(coverage) run --source=nextcloudappstore $(manage-script) test --settings nextcloudappstore.settings.development -v 2
$(coverage) report --fail-under 90
npm test
poetry run coverage run --source=nextcloudappstore $(manage-script) test --settings nextcloudappstore.settings.development -v 2
poetry run coverage report --fail-under 90

.PHONY: resetup
resetup:
Expand All @@ -29,9 +22,9 @@ initmigrations:
.PHONY: dev-setup
dev-setup:
rm -f db.sqlite3
$(npm) install
$(npm) run build
$(poetry) install
npm install
npm run build
poetry install
cp $(CURDIR)/scripts/development/settings/base.py $(CURDIR)/nextcloudappstore/settings/development.py
cat $(CURDIR)/scripts/development/settings/$(db).py >> $(CURDIR)/nextcloudappstore/settings/development.py
$(MAKE) initdb
Expand All @@ -53,12 +46,12 @@ docs html:

.PHONY: update-dev-deps
update-dev-deps:
$(poetry) upgrade
$(npm) install --upgrade
poetry upgrade
npm install --upgrade

.PHONY: authors
authors:
$(python) $(CURDIR)/scripts/generate_authors.py
poetry run python $(CURDIR)/scripts/generate_authors.py

.PHONY: clean
clean:
Expand All @@ -69,11 +62,11 @@ clean:

.PHONY: test-data
test-data: test-user
PYTHONPATH="${PYTHONPATH}:$(CURDIR)/scripts/" $(python) -m development.testdata
PYTHONPATH="${PYTHONPATH}:$(CURDIR)/scripts/" poetry run python -m development.testdata

.PHONY: prod-data
prod-data:
PYTHONPATH="${PYTHONPATH}:$(CURDIR)/scripts/" $(python) -m development.proddata $(prod_version)
PYTHONPATH="${PYTHONPATH}:$(CURDIR)/scripts/" poetry run python -m development.proddata 27.0.0

.PHONY: l10n
l10n:
Expand All @@ -82,7 +75,7 @@ l10n:

.PHONY: coverage
coverage:
$(coverage) xml
poetry run coverage xml

.PHONY: test-user
test-user:
Expand Down