diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 554e8055..a8284d3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false # don't interrupt the other test processes matrix: - pytest-mark: [slow, not slow] + pytest-mark: [not slow] steps: - name: Check out repository uses: actions/checkout@v4 diff --git a/core/views/user.py b/core/views/user.py index 8e7b092c..aedb30cb 100644 --- a/core/views/user.py +++ b/core/views/user.py @@ -205,14 +205,6 @@ class UserTabsMixin(TabedViewMixin): "name": _("Pictures"), }, ] - if settings.SITH_ENABLE_GALAXY and self.request.user.was_subscribed: - tab_list.append( - { - "url": reverse("galaxy:user", kwargs={"user_id": user.id}), - "slug": "galaxy", - "name": _("Galaxy"), - } - ) if self.request.user == user: tab_list.append( {"url": reverse("core:user_tools"), "slug": "tools", "name": _("Tools")} diff --git a/galaxy/tests.py b/galaxy/tests.py index b9e709ec..fc92fe9e 100644 --- a/galaxy/tests.py +++ b/galaxy/tests.py @@ -33,6 +33,7 @@ from core.models import User from galaxy.models import Galaxy +@pytest.mark.skip(reason="Galaxy is disabled for now") class TestGalaxyModel(TestCase): @classmethod def setUpTestData(cls): @@ -144,6 +145,7 @@ class TestGalaxyModel(TestCase): @pytest.mark.slow +@pytest.mark.skip(reason="Galaxy is disabled for now") class TestGalaxyView(TestCase): @classmethod def setUpTestData(cls): diff --git a/sith/settings.py b/sith/settings.py index f75b1ac9..ab16e7d5 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -341,10 +341,6 @@ SITH_URL = env.str("SITH_URL", default="127.0.0.1:8000") SITH_NAME = env.str("SITH_NAME", default="AE UTBM") SITH_TWITTER = "@ae_utbm" -# Enable experimental features -# Enable/Disable the galaxy button on user profile (urls stay activated) -SITH_ENABLE_GALAXY = False - # AE configuration # TODO: keep only that first setting, with the ID, and do the same for the other clubs SITH_MAIN_CLUB_ID = env.int("SITH_MAIN_CLUB_ID", default=1) diff --git a/sith/urls.py b/sith/urls.py index 0dfa1310..b60f0334 100644 --- a/sith/urls.py +++ b/sith/urls.py @@ -53,7 +53,6 @@ urlpatterns = [ path("sas/", include(("sas.urls", "sas"), namespace="sas")), path("election/", include(("election.urls", "election"), namespace="election")), path("forum/", include(("forum.urls", "forum"), namespace="forum")), - path("galaxy/", include(("galaxy.urls", "galaxy"), namespace="galaxy")), path("trombi/", include(("trombi.urls", "trombi"), namespace="trombi")), path("matmatronch/", include(("matmat.urls", "matmat"), namespace="matmat")), path("pedagogy/", include(("pedagogy.urls", "pedagogy"), namespace="pedagogy")), @@ -68,7 +67,10 @@ if settings.DEBUG: urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) import debug_toolbar - urlpatterns += [path("__debug__/", include(debug_toolbar.urls))] + urlpatterns += [ + path("__debug__/", include(debug_toolbar.urls)), + path("galaxy/", include(("galaxy.urls", "galaxy"), namespace="galaxy")), + ] def sentry_debug(request):