Merge branch 'update_installed_apps' into 'django3_migration'

Update installed apps

See merge request !376

beat/web/common/apps.py

@@ -26,8 +26,14 @@
 ###############################################################################
 
 from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
 
 
 class CommonAppConfig(AppConfig):
     def ready(self):
         from .signals.handlers import on_shared  # noqa: F401
+
+
+class CommonConfig(CommonAppConfig):
+    name = "beat.web.common"
+    verbose_name = _("Application common")

beat/web/reports/apps.py

+# vim: set fileencoding=utf-8 :
+
+###############################################################################
+#                                                                             #
+# Copyright (c) 2020 Idiap Research Institute, http://www.idiap.ch/           #
+# Contact: beat.support@idiap.ch                                              #
+#                                                                             #
+# This file is part of the beat.web module of the BEAT platform.              #
+#                                                                             #
+# Commercial License Usage                                                    #
+# Licensees holding valid commercial BEAT licenses may use this file in       #
+# accordance with the terms contained in a written agreement between you      #
+# and Idiap. For further information contact tto@idiap.ch                     #
+#                                                                             #
+# Alternatively, this file may be used under the terms of the GNU Affero      #
+# Public License version 3 as published by the Free Software and appearing    #
+# in the file LICENSE.AGPL included in the packaging of this file.            #
+# The BEAT platform is distributed in the hope that it will be useful, but    #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE.                                        #
+#                                                                             #
+# You should have received a copy of the GNU Affero Public License along      #
+# with the BEAT platform. If not, see http://www.gnu.org/licenses/.           #
+#                                                                             #
+###############################################################################
+
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class ReportsConfig(AppConfig):
+    name = "beat.web.reports"
+    verbose_name = _("Reports")

beat/web/settings/settings.py

@@ -316,25 +316,25 @@ INSTALLED_APPS = (
     "rest_framework.authtoken",
     "jsonfield",
     "actstream",
-    "beat.web.ui.registration",
-    "beat.web.accounts",
-    "beat.web.algorithms",
-    "beat.web.plotters",
-    "beat.web.attestations",
-    "beat.web.backend",
-    "beat.web.common",
-    "beat.web.databases",
-    "beat.web.dataformats",
-    "beat.web.experiments",
-    "beat.web.libraries",
-    "beat.web.navigation",
-    "beat.web.search",
-    "beat.web.statistics",
-    "beat.web.toolchains",
-    "beat.web.ui",
-    "beat.web.utils",
-    "beat.web.team",
-    "beat.web.reports",
+    "beat.web.ui.registration.apps.UiRegistrationConfig",
+    "beat.web.accounts.apps.AccountsConfig",
+    "beat.web.algorithms.apps.AlgorithmsConfig",
+    "beat.web.plotters.apps.PlottersConfig",
+    "beat.web.attestations.apps.AttestationsConfig",
+    "beat.web.backend.apps.BackendConfig",
+    "beat.web.common.apps.CommonConfig",
+    "beat.web.databases.apps.DatabasesConfig",
+    "beat.web.dataformats.apps.DataFormatsConfig",
+    "beat.web.experiments.apps.ExperimentsConfig",
+    "beat.web.libraries.apps.LibrariesConfig",
+    "beat.web.navigation.apps.NavigationConfig",
+    "beat.web.search.apps.SearchConfig",
+    "beat.web.statistics.apps.StatisticsConfig",
+    "beat.web.toolchains.apps.ToolchainsConfig",
+    "beat.web.ui.apps.UiConfig",
+    "beat.web.utils.apps.UtilsConfig",
+    "beat.web.team.apps.TeamConfig",
+    "beat.web.reports.apps.ReportsConfig",
 )
 
 # Secure re-estructured text markup parsing

beat/web/statistics/apps.py

+# vim: set fileencoding=utf-8 :
+
+###############################################################################
+#                                                                             #
+# Copyright (c) 2020 Idiap Research Institute, http://www.idiap.ch/           #
+# Contact: beat.support@idiap.ch                                              #
+#                                                                             #
+# This file is part of the beat.web module of the BEAT platform.              #
+#                                                                             #
+# Commercial License Usage                                                    #
+# Licensees holding valid commercial BEAT licenses may use this file in       #
+# accordance with the terms contained in a written agreement between you      #
+# and Idiap. For further information contact tto@idiap.ch                     #
+#                                                                             #
+# Alternatively, this file may be used under the terms of the GNU Affero      #
+# Public License version 3 as published by the Free Software and appearing    #
+# in the file LICENSE.AGPL included in the packaging of this file.            #
+# The BEAT platform is distributed in the hope that it will be useful, but    #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE.                                        #
+#                                                                             #
+# You should have received a copy of the GNU Affero Public License along      #
+# with the BEAT platform. If not, see http://www.gnu.org/licenses/.           #
+#                                                                             #
+###############################################################################
+
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class StatisticsConfig(AppConfig):
+    name = "beat.web.statistics"
+    verbose_name = _("Statistics")

beat/web/ui/apps.py

+# vim: set fileencoding=utf-8 :
+
+###############################################################################
+#                                                                             #
+# Copyright (c) 2020 Idiap Research Institute, http://www.idiap.ch/           #
+# Contact: beat.support@idiap.ch                                              #
+#                                                                             #
+# This file is part of the beat.web module of the BEAT platform.              #
+#                                                                             #
+# Commercial License Usage                                                    #
+# Licensees holding valid commercial BEAT licenses may use this file in       #
+# accordance with the terms contained in a written agreement between you      #
+# and Idiap. For further information contact tto@idiap.ch                     #
+#                                                                             #
+# Alternatively, this file may be used under the terms of the GNU Affero      #
+# Public License version 3 as published by the Free Software and appearing    #
+# in the file LICENSE.AGPL included in the packaging of this file.            #
+# The BEAT platform is distributed in the hope that it will be useful, but    #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE.                                        #
+#                                                                             #
+# You should have received a copy of the GNU Affero Public License along      #
+# with the BEAT platform. If not, see http://www.gnu.org/licenses/.           #
+#                                                                             #
+###############################################################################
+
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class UiConfig(AppConfig):
+    name = "beat.web.ui"
+    verbose_name = _("Ui")

beat/web/ui/registration/apps.py

+# vim: set fileencoding=utf-8 :
+
+###############################################################################
+#                                                                             #
+# Copyright (c) 2020 Idiap Research Institute, http://www.idiap.ch/           #
+# Contact: beat.support@idiap.ch                                              #
+#                                                                             #
+# This file is part of the beat.web module of the BEAT platform.              #
+#                                                                             #
+# Commercial License Usage                                                    #
+# Licensees holding valid commercial BEAT licenses may use this file in       #
+# accordance with the terms contained in a written agreement between you      #
+# and Idiap. For further information contact tto@idiap.ch                     #
+#                                                                             #
+# Alternatively, this file may be used under the terms of the GNU Affero      #
+# Public License version 3 as published by the Free Software and appearing    #
+# in the file LICENSE.AGPL included in the packaging of this file.            #
+# The BEAT platform is distributed in the hope that it will be useful, but    #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE.                                        #
+#                                                                             #
+# You should have received a copy of the GNU Affero Public License along      #
+# with the BEAT platform. If not, see http://www.gnu.org/licenses/.           #
+#                                                                             #
+###############################################################################
+
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class UiRegistrationConfig(AppConfig):
+    name = "beat.web.ui.registration"
+    verbose_name = _("Ui Registration")

beat/web/utils/apps.py

+# vim: set fileencoding=utf-8 :
+
+###############################################################################
+#                                                                             #
+# Copyright (c) 2020 Idiap Research Institute, http://www.idiap.ch/           #
+# Contact: beat.support@idiap.ch                                              #
+#                                                                             #
+# This file is part of the beat.web module of the BEAT platform.              #
+#                                                                             #
+# Commercial License Usage                                                    #
+# Licensees holding valid commercial BEAT licenses may use this file in       #
+# accordance with the terms contained in a written agreement between you      #
+# and Idiap. For further information contact tto@idiap.ch                     #
+#                                                                             #
+# Alternatively, this file may be used under the terms of the GNU Affero      #
+# Public License version 3 as published by the Free Software and appearing    #
+# in the file LICENSE.AGPL included in the packaging of this file.            #
+# The BEAT platform is distributed in the hope that it will be useful, but    #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY  #
+# or FITNESS FOR A PARTICULAR PURPOSE.                                        #
+#                                                                             #
+# You should have received a copy of the GNU Affero Public License along      #
+# with the BEAT platform. If not, see http://www.gnu.org/licenses/.           #
+#                                                                             #
+###############################################################################
+
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class UtilsConfig(AppConfig):
+    name = "beat.web.utils"
+    verbose_name = _("Utilities")

develop.cfg

@@ -2,6 +2,7 @@
 extends = common.cfg
 always-checkout = force
 versions = versions
+eggs += nose
 develop = src/beat.backend.python
           src/beat.core
           src/beat.cmdline

setup.py

@@ -25,7 +25,8 @@
 #                                                                             #
 ###############################################################################
 
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
 
 
 def load_requirements(f):
@@ -33,6 +34,8 @@ def load_requirements(f):
     return [k for k in retval if k and k[0] not in ("#", "-")]
 
 
+test_dependencies = ["nose"]
+
 # The only thing we do in this file is to call the setup() function with all
 # parameters that define our package.
 setup(
@@ -49,6 +52,7 @@ setup(
     include_package_data=True,
     zip_safe=False,
     install_requires=load_requirements("requirements.txt"),
+    tests_require=test_dependencies,
     classifiers=[
         "Framework :: BEAT",
         "Development Status :: 5 - Production/Stable",