From 45c35038dbf36bcbed4f9ff5e3c9bc02b4164747 Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 22 Apr 2022 11:01:10 +0200 Subject: fix language switch --- Makefile | 8 ++++++-- pyproject.toml | 39 +++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 3047d20..faca678 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ install_global=false -include config.mk +version := $(shell poetry version | awk '{ print $$2 }') + .PHONY: all all: @echo "This is a python project, no compilation required" @@ -16,11 +18,13 @@ endif .PHONY: install-global install-global: compile - pip3 install . + poetry build -f wheel + pip3 install --upgrade --ignore-installed "dist/talermerchantdemos-$(version)-py3-none-any.whl" .PHONY: install-local install-local: compile - pip3 install . --user + poetry build -f wheel + pip3 install --upgrade --ignore-installed --user "dist/talermerchantdemos-$(version)-py3-none-any.whl" # run testcases .PHONY: check diff --git a/pyproject.toml b/pyproject.toml index e5c0bfe..2c07420 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,33 +10,28 @@ authors = [ license = "AGPL3+" include = [ # Common - "static/*.css", - "static/*.svg", - "templates/*.j2", - "translations/*/LC_MESSAGES/*.mo", + "talermerchantdemos/static/*.css", + "talermerchantdemos/static/*.svg", + "talermerchantdemos/templates/*.j2", + "talermerchantdemos/translations/*/LC_MESSAGES/*.mo", # Landing files - "landing/templates/*.j2", - "landing/static/*.css", - "landing/translations/*/LC_MESSAGES/*.mo", + "talermerchantdemos/landing/templates/*.j2", + "talermerchantdemos/landing/static/*.css", # Blog files - "blog/templates/*.html", - "blog/templates/*.j2", - "blog/static/favicon.ico", - "blog/static/*.css", + "talermerchantdemos/blog/templates/*.html", + "talermerchantdemos/blog/templates/*.j2", + "talermerchantdemos/blog/static/favicon.ico", + "talermerchantdemos/blog/static/*.css", #"blog/articles/*/*", - "blog/translations/*/LC_MESSAGES/*.mo", - "translations/*/LC_MESSAGES/*.mo", - "blog/data/*", + "talermerchantdemos/blog/data/*", # Donation files - "donations/templates/*.j2", - "donations/static/*.css", - "donations/translations/*/LC_MESSAGES/*.mo", + "talermerchantdemos/donations/templates/*.j2", + "talermerchantdemos/donations/static/*.css", # Survey files - "survey/templates/*.j2", - "survey/static/favicon.ico", - "survey/static/*.js", - "survey/static/*.css", - "survey/translations/*/LC_MESSAGES/*.mo", + "talermerchantdemos/survey/templates/*.j2", + "talermerchantdemos/survey/static/favicon.ico", + "talermerchantdemos/survey/static/*.js", + "talermerchantdemos/survey/static/*.css" ] -- cgit v1.2.3