Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
test:
machine:
image: ubuntu-2004:2022.07.1
image: ubuntu-2204:2024.01.2
steps:
- checkout

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.selenium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified src/static/img/partners/4paradigm.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/anr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/anr2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/barcelona.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/chalearn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/cnrs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/eit_health.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/google.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/idf.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/inria.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/lisn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/microsoft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/paris-saclay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/static/img/partners/stanford.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 21 additions & 20 deletions src/templates/pages/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
{% block top_div_extra_content %}

<div class="ui text container">
<img id="jumbo_logo" src="{% static "img/codabench.png" %}">
<img id="jumbo_logo" src="{% static 'img/codabench.png' %}">
<div class="organization-logos">
<!-- LISN logo -->
<a href="https://www.lisn.upsaclay.fr/" target="_blank">
<img class="organization-logo" src="{% static "img/lisn-logo.svg" %}">
<img class="organization-logo" src="{% static 'img/lisn-logo.svg' %}">
</a>
<!-- Université Paris-Saclay logo -->
<a href="https://www.universite-paris-saclay.fr/" target="_blank">
<img class="organization-logo" src="{% static "img/paris-saclay-logo.svg" %}">
<img class="organization-logo" src="{% static 'img/paris-saclay-logo.svg' %}">
</a>
<!-- CNRS logo -->
<a href="https://www.cnrs.fr/" target="_blank">
<img class="organization-logo" src="{% static "img/cnrs-logo.svg" %}">
<img class="organization-logo" src="{% static 'img/cnrs-logo.svg' %}">
</a>
<!-- Chalearn logo -->
<a href="http://www.chalearn.org/" target="_blank">
<img class="organization-logo" src="{% static "img/chalearn-logo.svg" %}">
<img class="organization-logo" src="{% static 'img/chalearn-logo.svg' %}">
</a>
</div>
</div>
Expand Down Expand Up @@ -233,56 +233,57 @@ <h3 class="news-heading-title">{{post.title}}</h3>
</div>

<!-- Partners Section -->
<!--
<div class="segment-container ui segment full-width">
<div class="ui header">Partners</div>
<div class="container-content" id="partners-row1">
<a href="https://www.universite-paris-saclay.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/paris-saclay.png" %}">
<img class="partner-img" src="{% static 'img/partners/paris-saclay.png' %}">
</a>
<a href="https://www.microsoft.com/" target="_blank">
<img class="partner-img" src="{% static "img/partners/microsoft.png" %}">
<img class="partner-img" src="{% static 'img/partners/microsoft.png' %}">
</a>
<a href="http://www.chalearn.org/" target="_blank">
<img class="partner-img" src="{% static "img/partners/chalearn.png" %}">
<img class="partner-img" src="{% static 'img/partners/chalearn.png' %}">
</a>
<a href="http://www.ub.edu/web/ub/en/" target="_blank">
<img class="partner-img" src="{% static "img/partners/barcelona.png" %}">
<img class="partner-img" src="{% static 'img/partners/barcelona.png' %}">
</a>
<a href="https://www.stanford.edu/" target="_blank">
<img class="partner-img" src="{% static "img/partners/stanford.png" %}">
<img class="partner-img" src="{% static 'img/partners/stanford.png' %}">
</a>
<a href="https://www.iledefrance.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/idf.jpg" %}">
<img class="partner-img" src="{% static 'img/partners/idf.jpg' %}">
</a>
<a href="https://www.inria.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/inria.png" %}">
<img class="partner-img" src="{% static 'img/partners/inria.png' %}">
</a>
</div>
<div class="container-content">
<a href="https://www.lisn.upsaclay.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/lisn.png" %}">
<img class="partner-img" src="{% static 'img/partners/lisn.png' %}">
</a>
<a href="https://www.google.com/" target="_blank">
<img class="partner-img" src="{% static "img/partners/google.jpg" %}">
<img class="partner-img" src="{% static 'img/partners/google.jpg' %}">
</a>
<a href="https://en.4paradigm.com/" target="_blank">
<img class="partner-img" src="{% static "img/partners/4paradigm.jpg" %}">
<img class="partner-img" src="{% static 'img/partners/4paradigm.jpg' %}">
</a>
<a href="https://www.cnrs.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/cnrs.png" %}">
<img class="partner-img" src="{% static 'img/partners/cnrs.png' %}">
</a>
<a href="https://anr.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/anr.png" %}">
<img class="partner-img" src="{% static 'img/partners/anr.png' %}">
</a>
<a href="https://anr.fr/" target="_blank">
<img class="partner-img" src="{% static "img/partners/anr2.jpg" %}">
<img class="partner-img" src="{% static 'img/partners/anr2.jpg' %}">
</a>
<a href="https://www.eithealth.eu/" target="_blank">
<img class="partner-img" src="{% static "img/partners/eit_health.jpg" %}">
<img class="partner-img" src="{% static 'img/partners/eit_health.jpg' %}">
</a>
</div>

</div>
-->

</div>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion src/tests/functional/test_competitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down