From e7796d4172c57eedca8ad911e097119447cdf653 Mon Sep 17 00:00:00 2001 From: Uxio Fuentefria Date: Wed, 19 Jun 2019 14:41:35 +0200 Subject: [PATCH] Rename service to `Safe Transaction Service` --- .env | 4 ++-- .env_local | 2 +- .travis.yml | 4 ++-- README.md | 14 +++++++------- config/settings/base.py | 8 ++++---- config/urls.py | 2 +- config/wsgi.py | 4 ++-- docker/web/celery/scheduler/run.sh | 2 +- docker/web/celery/worker/run.sh | 2 +- docs/Makefile | 8 ++++---- docs/conf.py | 8 ++++---- manage.py | 4 ++-- run_tests.sh | 2 +- .../__init__.py | 0 .../history/__init__.py | 0 .../history/admin.py | 0 .../history/apps.py | 2 +- .../history/filters.py | 0 .../history/management/__init__.py | 0 .../history/management/commands/__init__.py | 0 .../history/migrations/0001_initial.py | 0 .../history/migrations/__init__.py | 0 .../history/models.py | 0 .../history/redis_service.py | 0 .../history/serializers.py | 0 .../history/tasks.py | 0 .../history/tests/__init__.py | 0 .../history/tests/factories.py | 0 .../history/tests/test_serializers.py | 2 +- .../history/tests/test_tasks.py | 0 .../history/tests/test_views.py | 0 .../history/urls.py | 0 .../history/views.py | 4 ++-- .../static/.gitignore | 0 .../taskapp/__init__.py | 0 .../taskapp/celery.py | 4 ++-- .../version.py | 0 37 files changed, 38 insertions(+), 38 deletions(-) rename {safe_transaction_history => safe_transaction_service}/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/admin.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/apps.py (59%) rename {safe_transaction_history => safe_transaction_service}/history/filters.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/management/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/management/commands/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/migrations/0001_initial.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/migrations/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/models.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/redis_service.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/serializers.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/tasks.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/tests/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/tests/factories.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/tests/test_serializers.py (95%) rename {safe_transaction_history => safe_transaction_service}/history/tests/test_tasks.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/tests/test_views.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/urls.py (100%) rename {safe_transaction_history => safe_transaction_service}/history/views.py (97%) rename {safe_transaction_history => safe_transaction_service}/static/.gitignore (100%) rename {safe_transaction_history => safe_transaction_service}/taskapp/__init__.py (100%) rename {safe_transaction_history => safe_transaction_service}/taskapp/celery.py (91%) rename {safe_transaction_history => safe_transaction_service}/version.py (100%) diff --git a/.env b/.env index e4754f517..0ac195a5e 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PYTHONPATH=/app/safe_transaction_history +PYTHONPATH=/app/safe_transaction_service DJANGO_SETTINGS_MODULE=config.settings.local C_FORCE_ROOT=true DEBUG=0 @@ -7,4 +7,4 @@ ETHEREUM_NODE_URL=http://ganache:8545 DATABASE_URL=psql://postgres@db:5432/postgres BROKER_URL=redis://redis:6379/0 REDIS_URL=redis://redis:6379/1 -CELERY_BROKER_URL=redis://redis:6379/0 \ No newline at end of file +CELERY_BROKER_URL=redis://redis:6379/0 diff --git a/.env_local b/.env_local index 7fdf40d88..437048b1d 100644 --- a/.env_local +++ b/.env_local @@ -1,4 +1,4 @@ -PYTHONPATH=/app/safe_transaction_history +PYTHONPATH=/app/safe_transaction_service C_FORCE_ROOT=true DEBUG=0 USE_DOCKER=False diff --git a/.travis.yml b/.travis.yml index a69ec94b7..ec235aef1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ python: - "3.7" env: global: - - DOCKERHUB_PROJECT=safe-transaction-history - - SOURCE_FOLDER=safe_transaction_history + - DOCKERHUB_PROJECT=safe-transaction-service + - SOURCE_FOLDER=safe_transaction_service - PIP_USE_MIRRORS=true - DJANGO_SETTINGS_MODULE=config.settings.test - DATABASE_URL=psql://postgres@localhost/travisci diff --git a/README.md b/README.md index dd349c4fd..284990abf 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -[![Build Status](https://travis-ci.org/gnosis/safe-transaction-history.svg?branch=master)](https://travis-ci.org/gnosis/safe-transaction-history) -[![Coverage Status](https://coveralls.io/repos/github/gnosis/safe-transaction-history/badge.svg?branch=master)](https://coveralls.io/github/gnosis/safe-transaction-history?branch=master) -![Python 3.6](https://img.shields.io/badge/Python-3.6-blue.svg) -![Django 2](https://img.shields.io/badge/Django-2-blue.svg) +[![Build Status](https://travis-ci.org/gnosis/safe-transaction-service.svg?branch=master)](https://travis-ci.org/gnosis/safe-transaction-service) +[![Coverage Status](https://coveralls.io/repos/github/gnosis/safe-transaction-service/badge.svg?branch=master)](https://coveralls.io/github/gnosis/safe-transaction-service?branch=master) +![Python 3.7](https://img.shields.io/badge/Python-3.7-blue.svg) +![Django 2.2](https://img.shields.io/badge/Django-2.2-blue.svg) -# Gnosis Transaction History service -Gnosis Transaction History service +# Gnosis Transaction Service +Gnosis Transaction Service ## Index of contents @@ -12,7 +12,7 @@ Gnosis Transaction History service Docs ------------ -You can open the diagrams with [Staruml](http://staruml.io/) +You can open the diagrams under `docs/` with [Staruml](http://staruml.io/) Contributors ------------ diff --git a/config/settings/base.py b/config/settings/base.py index ed3dfb49e..94880feb5 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -4,8 +4,8 @@ import environ -ROOT_DIR = environ.Path(__file__) - 3 # (safe_transaction_history/config/settings/base.py - 3 = safe-transaction-history/) -APPS_DIR = ROOT_DIR.path('safe_transaction_history') +ROOT_DIR = environ.Path(__file__) - 3 # (safe_transaction_service/config/settings/base.py - 3 = safe-transaction-service/) +APPS_DIR = ROOT_DIR.path('safe_transaction_service') env = environ.Env() @@ -69,7 +69,7 @@ 'drf_yasg', ] LOCAL_APPS = [ - 'safe_transaction_history.history.apps.HistoryConfig', + 'safe_transaction_service.history.apps.HistoryConfig', ] # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS @@ -174,7 +174,7 @@ # Celery # ------------------------------------------------------------------------------ INSTALLED_APPS += [ - 'safe_transaction_history.taskapp.celery.CeleryConfig', + 'safe_transaction_service.taskapp.celery.CeleryConfig', 'django_celery_beat', ] # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url diff --git a/config/urls.py b/config/urls.py index da8255d23..c8503673b 100644 --- a/config/urls.py +++ b/config/urls.py @@ -24,7 +24,7 @@ url(r'^swagger(?P\.json|\.yaml)$', schema_view.without_ui(cache_timeout=None), name='schema-json'), url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=None), name='schema-redoc'), url(settings.ADMIN_URL, admin.site.urls), - url(r'^api/v1/', include('safe_transaction_history.history.urls', namespace='v1')), + url(r'^api/v1/', include('safe_transaction_service.history.urls', namespace='v1')), url(r'^check/', lambda request: HttpResponse("Ok"), name='check'), ] diff --git a/config/wsgi.py b/config/wsgi.py index c53baed15..b8aa80126 100644 --- a/config/wsgi.py +++ b/config/wsgi.py @@ -19,10 +19,10 @@ from django.core.wsgi import get_wsgi_application # This allows easy placement of apps within the interior -# safe_transaction_history directory. +# safe_transaction_service directory. app_path = os.path.abspath(os.path.join( os.path.dirname(os.path.abspath(__file__)), os.pardir)) -sys.path.append(os.path.join(app_path, 'safe_transaction_history')) +sys.path.append(os.path.join(app_path, 'safe_transaction_service')) diff --git a/docker/web/celery/scheduler/run.sh b/docker/web/celery/scheduler/run.sh index e3395c8e1..31163c18a 100755 --- a/docker/web/celery/scheduler/run.sh +++ b/docker/web/celery/scheduler/run.sh @@ -10,4 +10,4 @@ else fi echo "==> Running Celery beat <==" -exec celery beat -A safe_transaction_history.taskapp -S django_celery_beat.schedulers:DatabaseScheduler --loglevel $log_level +exec celery beat -A safe_transaction_service.taskapp -S django_celery_beat.schedulers:DatabaseScheduler --loglevel $log_level diff --git a/docker/web/celery/worker/run.sh b/docker/web/celery/worker/run.sh index f35996388..cb703a298 100755 --- a/docker/web/celery/worker/run.sh +++ b/docker/web/celery/worker/run.sh @@ -2,4 +2,4 @@ set -euo pipefail -celery -A safe_transaction_history.taskapp worker -l INFO +celery -A safe_transaction_service.taskapp worker -l INFO diff --git a/docs/Makefile b/docs/Makefile index cf4209e72..e330a026b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -77,17 +77,17 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/safe_transaction_history.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/safe_transaction_service.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/safe_transaction_history.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/safe_transaction_service.qhc" devhelp: $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/safe_transaction_history" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/safe_transaction_history" + @echo "# mkdir -p $$HOME/.local/share/devhelp/safe_transaction_service" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/safe_transaction_service" @echo "# devhelp" epub: diff --git a/docs/conf.py b/docs/conf.py index a0fddcbd1..10e3e7528 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -163,7 +163,7 @@ # html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = "safe_transaction_historydoc" +htmlhelp_basename = "safe_transaction_servicedoc" # -- Options for LaTeX output -------------------------------------------------- @@ -182,7 +182,7 @@ latex_documents = [ ( "index", - "safe_transaction_history.tex", + "safe_transaction_service.tex", "Gnosis Transaction History Documentation", """Gnosis""", "manual", @@ -217,7 +217,7 @@ man_pages = [ ( "index", - "safe_transaction_history", + "safe_transaction_service", "Gnosis Safe Relay Service Documentation", ["""Gnosis"""], 1, @@ -236,7 +236,7 @@ texinfo_documents = [ ( "index", - "safe_transaction_history", + "safe_transaction_service", "Gnosis Safe Relay Service Documentation", """Gnosis""", "Gnosis Safe Relay Service", diff --git a/manage.py b/manage.py index c757cca89..a23b554cc 100644 --- a/manage.py +++ b/manage.py @@ -22,8 +22,8 @@ raise # This allows easy placement of apps within the interior - # safe_transaction_history directory. + # safe_transaction_service directory. current_path = os.path.dirname(os.path.abspath(__file__)) - sys.path.append(os.path.join(current_path, 'safe_transaction_history')) + sys.path.append(os.path.join(current_path, 'safe_transaction_service')) execute_from_command_line(sys.argv) diff --git a/run_tests.sh b/run_tests.sh index d5e543674..7eb2ab518 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,5 +4,5 @@ set -euo pipefail docker-compose build --force-rm docker-compose create -docker restart safe-transaction-history_db_1 safe-transaction-history_redis_1 safe-transaction-history_ganache_1 +docker restart safe-transaction-service_db_1 safe-transaction-service_redis_1 safe-transaction-service_ganache_1 DJANGO_DOT_ENV_FILE=.env_local pytest diff --git a/safe_transaction_history/__init__.py b/safe_transaction_service/__init__.py similarity index 100% rename from safe_transaction_history/__init__.py rename to safe_transaction_service/__init__.py diff --git a/safe_transaction_history/history/__init__.py b/safe_transaction_service/history/__init__.py similarity index 100% rename from safe_transaction_history/history/__init__.py rename to safe_transaction_service/history/__init__.py diff --git a/safe_transaction_history/history/admin.py b/safe_transaction_service/history/admin.py similarity index 100% rename from safe_transaction_history/history/admin.py rename to safe_transaction_service/history/admin.py diff --git a/safe_transaction_history/history/apps.py b/safe_transaction_service/history/apps.py similarity index 59% rename from safe_transaction_history/history/apps.py rename to safe_transaction_service/history/apps.py index fb644814f..601108395 100644 --- a/safe_transaction_history/history/apps.py +++ b/safe_transaction_service/history/apps.py @@ -2,4 +2,4 @@ class HistoryConfig(AppConfig): - name = 'safe_transaction_history.history' + name = 'safe_transaction_service.history' diff --git a/safe_transaction_history/history/filters.py b/safe_transaction_service/history/filters.py similarity index 100% rename from safe_transaction_history/history/filters.py rename to safe_transaction_service/history/filters.py diff --git a/safe_transaction_history/history/management/__init__.py b/safe_transaction_service/history/management/__init__.py similarity index 100% rename from safe_transaction_history/history/management/__init__.py rename to safe_transaction_service/history/management/__init__.py diff --git a/safe_transaction_history/history/management/commands/__init__.py b/safe_transaction_service/history/management/commands/__init__.py similarity index 100% rename from safe_transaction_history/history/management/commands/__init__.py rename to safe_transaction_service/history/management/commands/__init__.py diff --git a/safe_transaction_history/history/migrations/0001_initial.py b/safe_transaction_service/history/migrations/0001_initial.py similarity index 100% rename from safe_transaction_history/history/migrations/0001_initial.py rename to safe_transaction_service/history/migrations/0001_initial.py diff --git a/safe_transaction_history/history/migrations/__init__.py b/safe_transaction_service/history/migrations/__init__.py similarity index 100% rename from safe_transaction_history/history/migrations/__init__.py rename to safe_transaction_service/history/migrations/__init__.py diff --git a/safe_transaction_history/history/models.py b/safe_transaction_service/history/models.py similarity index 100% rename from safe_transaction_history/history/models.py rename to safe_transaction_service/history/models.py diff --git a/safe_transaction_history/history/redis_service.py b/safe_transaction_service/history/redis_service.py similarity index 100% rename from safe_transaction_history/history/redis_service.py rename to safe_transaction_service/history/redis_service.py diff --git a/safe_transaction_history/history/serializers.py b/safe_transaction_service/history/serializers.py similarity index 100% rename from safe_transaction_history/history/serializers.py rename to safe_transaction_service/history/serializers.py diff --git a/safe_transaction_history/history/tasks.py b/safe_transaction_service/history/tasks.py similarity index 100% rename from safe_transaction_history/history/tasks.py rename to safe_transaction_service/history/tasks.py diff --git a/safe_transaction_history/history/tests/__init__.py b/safe_transaction_service/history/tests/__init__.py similarity index 100% rename from safe_transaction_history/history/tests/__init__.py rename to safe_transaction_service/history/tests/__init__.py diff --git a/safe_transaction_history/history/tests/factories.py b/safe_transaction_service/history/tests/factories.py similarity index 100% rename from safe_transaction_history/history/tests/factories.py rename to safe_transaction_service/history/tests/factories.py diff --git a/safe_transaction_history/history/tests/test_serializers.py b/safe_transaction_service/history/tests/test_serializers.py similarity index 95% rename from safe_transaction_history/history/tests/test_serializers.py rename to safe_transaction_service/history/tests/test_serializers.py index ca60c35ee..2a9f2eb7b 100644 --- a/safe_transaction_history/history/tests/test_serializers.py +++ b/safe_transaction_service/history/tests/test_serializers.py @@ -1,6 +1,6 @@ # from rest_framework.test import APITestCase # -# from safe_transaction_history.ether.tests.factories import get_eth_address_with_key, get_transaction_with_info +# from safe_transaction_service.ether.tests.factories import get_eth_address_with_key, get_transaction_with_info # from ..serializers import BaseSafeMultisigTransactionSerializer, SafeMultisigHistorySerializer # # diff --git a/safe_transaction_history/history/tests/test_tasks.py b/safe_transaction_service/history/tests/test_tasks.py similarity index 100% rename from safe_transaction_history/history/tests/test_tasks.py rename to safe_transaction_service/history/tests/test_tasks.py diff --git a/safe_transaction_history/history/tests/test_views.py b/safe_transaction_service/history/tests/test_views.py similarity index 100% rename from safe_transaction_history/history/tests/test_views.py rename to safe_transaction_service/history/tests/test_views.py diff --git a/safe_transaction_history/history/urls.py b/safe_transaction_service/history/urls.py similarity index 100% rename from safe_transaction_history/history/urls.py rename to safe_transaction_service/history/urls.py diff --git a/safe_transaction_history/history/views.py b/safe_transaction_service/history/views.py similarity index 97% rename from safe_transaction_history/history/views.py rename to safe_transaction_service/history/views.py index 8ece5fe7a..0c6e587ec 100644 --- a/safe_transaction_history/history/views.py +++ b/safe_transaction_service/history/views.py @@ -9,8 +9,8 @@ from rest_framework.response import Response from rest_framework.views import APIView -from safe_transaction_history.history.models import MultisigTransaction -from safe_transaction_history.version import __version__ +from safe_transaction_service.history.models import MultisigTransaction +from safe_transaction_service.version import __version__ from .filters import DefaultPagination from .serializers import (SafeMultisigHistoryResponseSerializer, diff --git a/safe_transaction_history/static/.gitignore b/safe_transaction_service/static/.gitignore similarity index 100% rename from safe_transaction_history/static/.gitignore rename to safe_transaction_service/static/.gitignore diff --git a/safe_transaction_history/taskapp/__init__.py b/safe_transaction_service/taskapp/__init__.py similarity index 100% rename from safe_transaction_history/taskapp/__init__.py rename to safe_transaction_service/taskapp/__init__.py diff --git a/safe_transaction_history/taskapp/celery.py b/safe_transaction_service/taskapp/celery.py similarity index 91% rename from safe_transaction_history/taskapp/celery.py rename to safe_transaction_service/taskapp/celery.py index b74856893..bd0618b55 100644 --- a/safe_transaction_history/taskapp/celery.py +++ b/safe_transaction_service/taskapp/celery.py @@ -10,11 +10,11 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local') # pragma: no cover -app = Celery('safe_transaction_history') +app = Celery('safe_transaction_service') class CeleryConfig(AppConfig): - name = 'safe_transaction_history.taskapp' + name = 'safe_transaction_service.taskapp' verbose_name = 'Celery Config' # Use Django logging instead of celery logger diff --git a/safe_transaction_history/version.py b/safe_transaction_service/version.py similarity index 100% rename from safe_transaction_history/version.py rename to safe_transaction_service/version.py