From d3e845860aa5726a13b1fdeb888f5dbe77c350b2 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 12:34:09 -0400 Subject: [PATCH 01/12] CompetitionSerializer Simple vs Detail --- src/apps/api/views/competitions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py index 774fd0df6..74f13e4e6 100644 --- a/src/apps/api/views/competitions.py +++ b/src/apps/api/views/competitions.py @@ -195,6 +195,8 @@ def get_permissions(self): def get_serializer_class(self): if self.action == 'list': return CompetitionSerializerSimple + if self.action == 'public': + return CompetitionSerializerSimple elif self.action in ['get_phases', 'results', 'get_leaderboard_frontend_object']: return LeaderboardPhaseSerializer elif self.request.method == 'GET': From bbe447606c7255374dec23782305fb59a076fd0f Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 13:48:02 -0400 Subject: [PATCH 02/12] new circleci image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14ce6ddd0..bbd52f8ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: test: machine: - image: ubuntu-2004:2022.07.1 + image: ubuntu-2204:2024.01.2 steps: - checkout From 91546a099b9485191fca8364cc6b5a6a416a84a9 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 15:07:43 -0400 Subject: [PATCH 03/12] new circleci image (selenium) --- docker-compose.selenium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.selenium.yml b/docker-compose.selenium.yml index b918d72f7..450f2c3e4 100644 --- a/docker-compose.selenium.yml +++ b/docker-compose.selenium.yml @@ -8,7 +8,7 @@ services: - 36475:36475 selenium: - image: selenium/standalone-firefox-debug:3.141.59 + image: selenium/standalone-firefox:124.0 volumes: - ./src/tests/functional/test_files:/test_files/ - ./artifacts:/artifacts/:z From 721a5036280c4e6614913e8bcf634a74f40abcc8 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 15:20:20 -0400 Subject: [PATCH 04/12] time stamp change --- src/tests/functional/test_competitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py index 860b3db55..3335afa83 100644 --- a/src/tests/functional/test_competitions.py +++ b/src/tests/functional/test_competitions.py @@ -28,7 +28,7 @@ def current_server_time_exists(self): # Check that the text is a valid datetime by loading it with strptime. # This will raise a ValueError if the format is incorrect. - assert datetime.strptime(text, '%B %d, %Y, %I:%M %p %Z') + assert datetime.strptime(text, '%B %d, %Y At %I:%M %p %Z') def _upload_competition(self, competition_zip_path): """Creates a competition and waits for success message. From 5fc39bb0c4b81553b4e5856188dd79f1922f1a14 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 20:26:51 -0400 Subject: [PATCH 05/12] circleci debug --- .circleci/config.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbd52f8ca..456fa9ca0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,12 @@ jobs: steps: - checkout + - run: + name: Show CircleCI IP Address + command: | + CIRCLE_IP_ADDRESS="10.240.0.$(( ${CIRCLE_BUILD_NUM} % 255 + 1))" + echo "CircleCI IP Address: $CIRCLE_IP_ADDRESS" + - run: # NOTE: To connect to this, use an SSH tunnel in front, like so.. # @@ -37,17 +43,13 @@ jobs: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml up -d docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django python manage.py collectstatic --noinput - - run: docker-compose exec django flake8 src/ - + # - run: + # name: e2e tests + # command: .docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py + # no_output_timeout: 60m - run: - name: pytest - command: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/ -m "not e2e" - - - run: - name: e2e tests - command: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/ -m e2e - no_output_timeout: 60m - + name: debug + command: sleep 1800 - store_artifacts: path: artifacts/ From 07cd051cd4a77ac65f7b57905352b04dd6d32bb3 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 21:06:34 -0400 Subject: [PATCH 06/12] migrate --- .circleci/config.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 456fa9ca0..78e38467d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,9 +43,15 @@ jobs: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml up -d docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django python manage.py collectstatic --noinput + - run: + name: Migrate + command: | + docker compose exec django ./manage.py migrate + + # - run: # name: e2e tests - # command: .docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py + # command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py # no_output_timeout: 60m - run: name: debug From f54d831f2eaee973e6bb9c91effdabfe0da4a654 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 21:38:27 -0400 Subject: [PATCH 07/12] migrate --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78e38467d..962b31c73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,10 +49,11 @@ jobs: docker compose exec django ./manage.py migrate - # - run: - # name: e2e tests - # command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py - # no_output_timeout: 60m + - run: + name: e2e tests + command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py + no_output_timeout: 60m + - run: name: debug command: sleep 1800 From c8831b9f8f3fe1d85ac13393a307caf8b6ce58a2 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Mon, 1 Apr 2024 23:01:11 -0400 Subject: [PATCH 08/12] migrate --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 962b31c73..171c82275 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,10 +53,10 @@ jobs: name: e2e tests command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py no_output_timeout: 60m - - - run: - name: debug - command: sleep 1800 + + # - run: + # name: debug + # command: sleep 1800 - store_artifacts: path: artifacts/ From 72b0405edda24d7745e5065370f5b59ed9564141 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Tue, 2 Apr 2024 22:54:22 -0400 Subject: [PATCH 09/12] firefox-latest --- docker-compose.selenium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.selenium.yml b/docker-compose.selenium.yml index 450f2c3e4..5f1a04c96 100644 --- a/docker-compose.selenium.yml +++ b/docker-compose.selenium.yml @@ -8,7 +8,7 @@ services: - 36475:36475 selenium: - image: selenium/standalone-firefox:124.0 + image: selenium/standalone-firefox:latest volumes: - ./src/tests/functional/test_files:/test_files/ - ./artifacts:/artifacts/:z From 301b2e028205ae66ebc1c80f76896b1614ed4573 Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Tue, 2 Apr 2024 23:00:45 -0400 Subject: [PATCH 10/12] firefox-latest --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 171c82275..b2f83a93b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,8 +51,9 @@ jobs: - run: name: e2e tests - command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py + command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/ -m e2e no_output_timeout: 60m + # command: docker compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/tests/functional/test_competitions.py # - run: # name: debug From e15104d1f1f29b4a2009e7e16a9e3b543358570a Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Wed, 3 Apr 2024 01:18:48 -0400 Subject: [PATCH 11/12] issues related to partners logos --- src/templates/pages/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/pages/home.html b/src/templates/pages/home.html index 5dcdd03c2..e96046cba 100644 --- a/src/templates/pages/home.html +++ b/src/templates/pages/home.html @@ -233,7 +233,7 @@

{{post.title}}

-
+
{% endblock %} From ed7d801fcfefb2030ed79d4045d0f844356ec86c Mon Sep 17 00:00:00 2001 From: Benjamin Bearce Date: Wed, 3 Apr 2024 01:29:16 -0400 Subject: [PATCH 12/12] config.yaml --- .circleci/config.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2f83a93b..9635a456d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,12 +7,6 @@ jobs: steps: - checkout - - run: - name: Show CircleCI IP Address - command: | - CIRCLE_IP_ADDRESS="10.240.0.$(( ${CIRCLE_BUILD_NUM} % 255 + 1))" - echo "CircleCI IP Address: $CIRCLE_IP_ADDRESS" - - run: # NOTE: To connect to this, use an SSH tunnel in front, like so.. # @@ -43,10 +37,10 @@ jobs: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml up -d docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django python manage.py collectstatic --noinput - - run: - name: Migrate - command: | - docker compose exec django ./manage.py migrate + # - run: + # name: Migrate + # command: | + # docker compose exec django ./manage.py migrate - run: