gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-bank] branch master updated: Address #6638


From: gnunet
Subject: [taler-bank] branch master updated: Address #6638
Date: Tue, 03 Nov 2020 21:22:12 +0100

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new f20afac  Address #6638
f20afac is described below

commit f20afac29a0b51efda915b5d708d9f206facb8c6
Author: MS <ms@taler.net>
AuthorDate: Tue Nov 3 21:20:49 2020 +0100

    Address #6638
---
 Makefile  | 26 +++++++++++++++++---------
 manage.py |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 0a69f54..daae638 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,14 @@ all:
 
 ifeq ($(install_global), true)
 install: install-global
+install-dependencies: install-dependencies-global
 else
 install: install-local
+install-dependencies: install-dependencies-local
 endif
 
 .PHONY: i18n-strings
-i18n-strings:
+i18n-strings: install-dependencies
        python3 manage.py makemessages -l it
        python3 manage.py makemessages -l de
 # Also update template for new languages
@@ -22,17 +24,23 @@ i18n-strings:
        mv talerbank/app/locale/en/LC_MESSAGES/django.po 
talerbank/app/locale/django.pot
        rm -r talerbank/app/locale/en/
 
-.PHONY: i18n
-i18n:
-       python3 manage.py compilemessages
-
 .PHONY: install-global
-install-global:
-       pip3 install .
+install-global: install-dependencies
+       python3 manage.py compilemessages
+       pip3 install --no-dependencies .
 
 .PHONY: install-local
-install-local:
-       pip3 install . --user
+install-local: install-dependencies
+       python3 manage.py compilemessages
+       pip3 install --no-dependencies . --user
+
+.PHONY: install-dependencies-global
+install-dependencies-global:
+       @pip3 install --editable .
+
+.PHONY: install-dependencies-local
+install-dependencies-local:
+       @pip3 install --editable . --user
 
 # See bug #5850 for some test cases that are currently disabled.
 .PHONY: check
diff --git a/manage.py b/manage.py
index 5f694d8..09bcf34 100755
--- a/manage.py
+++ b/manage.py
@@ -4,7 +4,7 @@ import os
 import sys
 
 def main():
-    if "compilemessages" not in sys.argv:
+    if "compilemessages" not in sys.argv and "makemessages" not in sys.argv:
         os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'talerbank.settings')
     try:
         from django.core.management import execute_from_command_line

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]