diff --git a/.circleci/config.yml b/.circleci/config.yml index 14ce6ddd0..250ff65ec 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 @@ -34,18 +34,18 @@ jobs: - run: name: Build containers and collect static command: | - 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 + 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: pytest - command: docker-compose -f docker-compose.yml -f docker-compose.selenium.yml exec django py.test src/ -m "not e2e" + 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 + 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 - store_artifacts: 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 diff --git a/src/static/img/partners/4paradigm.jpg b/src/static/img/partners/4paradigm.jpg index 8ce01a855..80821eeed 100644 Binary files a/src/static/img/partners/4paradigm.jpg and b/src/static/img/partners/4paradigm.jpg differ diff --git a/src/static/img/partners/anr.png b/src/static/img/partners/anr.png index 6a7d198bf..4665577bc 100644 Binary files a/src/static/img/partners/anr.png and b/src/static/img/partners/anr.png differ diff --git a/src/static/img/partners/anr2.jpg b/src/static/img/partners/anr2.jpg index 0ce57f4d8..ffeb84ef4 100644 Binary files a/src/static/img/partners/anr2.jpg and b/src/static/img/partners/anr2.jpg differ diff --git a/src/static/img/partners/barcelona.png b/src/static/img/partners/barcelona.png index 03ed5d5ee..2ccdf0151 100644 Binary files a/src/static/img/partners/barcelona.png and b/src/static/img/partners/barcelona.png differ diff --git a/src/static/img/partners/chalearn.png b/src/static/img/partners/chalearn.png index 2a0fb89a5..1965dae7a 100644 Binary files a/src/static/img/partners/chalearn.png and b/src/static/img/partners/chalearn.png differ diff --git a/src/static/img/partners/cnrs.png b/src/static/img/partners/cnrs.png index 3384434fa..434d6a653 100644 Binary files a/src/static/img/partners/cnrs.png and b/src/static/img/partners/cnrs.png differ diff --git a/src/static/img/partners/eit_health.jpg b/src/static/img/partners/eit_health.jpg index eb21d3c73..ab7c32709 100644 Binary files a/src/static/img/partners/eit_health.jpg and b/src/static/img/partners/eit_health.jpg differ diff --git a/src/static/img/partners/google.jpg b/src/static/img/partners/google.jpg index ba7f0d97d..133a9dcf7 100644 Binary files a/src/static/img/partners/google.jpg and b/src/static/img/partners/google.jpg differ diff --git a/src/static/img/partners/idf.jpg b/src/static/img/partners/idf.jpg index e31e219b0..1fafd4bd0 100644 Binary files a/src/static/img/partners/idf.jpg and b/src/static/img/partners/idf.jpg differ diff --git a/src/static/img/partners/inria.png b/src/static/img/partners/inria.png index 494c9736c..5632b6e0e 100644 Binary files a/src/static/img/partners/inria.png and b/src/static/img/partners/inria.png differ diff --git a/src/static/img/partners/lisn.png b/src/static/img/partners/lisn.png index 1b5c2c44a..a9dd600c4 100644 Binary files a/src/static/img/partners/lisn.png and b/src/static/img/partners/lisn.png differ diff --git a/src/static/img/partners/microsoft.png b/src/static/img/partners/microsoft.png index a25e74a9a..4f9e99c3d 100644 Binary files a/src/static/img/partners/microsoft.png and b/src/static/img/partners/microsoft.png differ diff --git a/src/static/img/partners/paris-saclay.png b/src/static/img/partners/paris-saclay.png index eedbc3b17..9d63b43ad 100644 Binary files a/src/static/img/partners/paris-saclay.png and b/src/static/img/partners/paris-saclay.png differ diff --git a/src/static/img/partners/stanford.png b/src/static/img/partners/stanford.png index 48ae628ff..c1d724694 100644 Binary files a/src/static/img/partners/stanford.png and b/src/static/img/partners/stanford.png differ diff --git a/src/templates/pages/home.html b/src/templates/pages/home.html index 5dcdd03c2..3dc54ed95 100644 --- a/src/templates/pages/home.html +++ b/src/templates/pages/home.html @@ -8,23 +8,23 @@ {% block top_div_extra_content %}
- +
- + - + - + - +
@@ -233,56 +233,57 @@

{{post.title}}

+ {% endblock %} 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.