Skip to content

Conversation

@bbearce
Copy link
Collaborator

@bbearce bbearce commented Sep 22, 2024

@ mention of reviewers

A brief description of the purpose of the changes contained in this PR.

Attempting to catalog changes by week.

Issues this PR resolves

Including the following bumps:

Django makes a larger jump from 2.2.28 - 3.0. I believe some other more core packages will be affected and so I think this is a good line in the sand to draw. We should merge this and then do a batch of updates just for the 2.2.28 -> 3.0 django upgrade.

A checklist for hand testing

  • make sure you rebuild django
docker build -f Dockerfile -t codabench-django:latest ./
# docker build --no-cache -f Dockerfile -t codabench-django:latest ./

/Version_Bumps.md has this and automatted testing at the bottom for convenience.

Any relevant files for testing

link to any relevant files (or drag and drop into github)

Checklist

  • Code review by me
  • Hand tested by me
  • I'm proud of my work
  • Code review by reviewer
  • Hand tested by reviewer
  • CircleCi tests are passing
  • Ready to merge

@bbearce bbearce changed the title Updates 09 15 22 2024 Updates 09 15-22 2024 Sep 23, 2024
@bbearce bbearce changed the title Updates 09 15-22 2024 Updates Sept 15-22 2024 Sep 23, 2024
@Didayolo
Copy link
Member

Didayolo commented Oct 3, 2024

@bbearce

The Version_Bumps.md file might not reflect the changes I just made (Python 3.9.20, and Django 2.2.28).

Also, can you tell more about this file? How will it be updated in the future?

@Didayolo
Copy link
Member

Didayolo commented Oct 3, 2024

 => [site_worker 2/8] RUN apt-get update && apt-get install -y gcc build-  5.8s
 => [site_worker 3/8] RUN curl -sSL https://install.python-poetry.org |   23.2s
 => [flower 3/9] RUN curl -sSL https://install.python-poetry.org | pytho  24.1s
 => [site_worker 4/8] RUN poetry config virtualenvs.create false           1.1s
 => [flower 4/9] RUN poetry config virtualenvs.create false                1.3s
 => [site_worker 5/8] RUN poetry config virtualenvs.in-project false       1.1s
 => [site_worker 6/8] COPY pyproject.toml poetry.lock ./                   0.1s
 => [flower 5/9] RUN poetry config virtualenvs.in-project false            1.2s
 => ERROR [site_worker 7/8] RUN poetry install                             2.3s
 => [flower 6/9] RUN poetry init --no-interaction                          1.2s
 => CANCELED [flower 7/9] RUN poetry add redis=3.0.1                       0.5s
------
 > [site_worker 7/8] RUN poetry install:
1.285 Skipping virtualenv creation, as specified in config file.
1.499 Installing dependencies from lock file
2.147 
2.148 pyproject.toml changed significantly since poetry.lock was last generated. Run `poetry lock [--no-update]` to fix the lock file.
------
failed to solve: process "/bin/sh -c poetry install" did not complete successfully: exit code: 1

Exited with code exit status 17

Looks like it did not like the Python bump.

@bbearce
Copy link
Collaborator Author

bbearce commented Oct 7, 2024

That file was more my notes and process. It might be useful for some so thought about leaving it, but upon second thought, it's clutter so i'll maintain my oen copy unless you all want something from it. This branch has the updated develop branch stuff as I saw you rebase it. Added a couple commits to get the tests to pass.

@Didayolo
Copy link
Member

Didayolo commented Oct 7, 2024

@bbearce So should we merge this PR?

@Didayolo Didayolo self-assigned this Oct 7, 2024
@bbearce
Copy link
Collaborator Author

bbearce commented Oct 8, 2024

Yes please!

@Didayolo Didayolo merged commit 137251f into develop Oct 11, 2024
@Didayolo Didayolo deleted the updates_09_15-22_2024 branch October 11, 2024 09:19
Didayolo added a commit that referenced this pull request Oct 11, 2024
* Fix string concat in case of no email in analytics api

* Updates Sept 15-22 2024 (#1593)

* jinja and pillow

* jinja and pillow

* Adding Versino_Bump_Instruction_README

* Version_Bumps file

* Version_Bumps file and req_treeFile updates

* gunicorn from 20.0.4 to 22.0.0

* Bump requests from 2.20.0 to 2.32.2

* Bump django from 2.2.17 to 2.2.18

* Bump django from 2.2.18 to 2.2.19 and to 3.2.25 eventually

* Bump django from 2.2.19 to 2.2.20

* Bump django from 2.2.20 to 2.2.25

* Bump django from 2.2.25 to 2.2.28

* Bump django from 2.2.25 to 2.2.28

* Version_Bumps.md text

* Update Dockerfile (upgrade Python)

* checking in some outstanding changes

* Remove Version Bumps

* removing version bumbs

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* organizers can now delete forum posts (#1613)

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* bundles renamed to competition bundles, swapped postions of bundles and tasks (#1591)

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

---------

Co-authored-by: OhMaley <tristanmary2@gmail.com>
Co-authored-by: Benjamin Bearce <bbearce@gmail.com>
Co-authored-by: Ihsan Ullah <ihsan2131@gmail.com>
Didayolo added a commit that referenced this pull request Oct 11, 2024
* autorun collectstatic when django container starts, added caddy_data and caddy_config to gitignore

* programs and datasets bug fixed

* if condition format fixed

* Downloading submissions witha stream v1

* updated toml file with python version and bpython version, deleted lock file, update dockerfile to not copy lock file and to generate lock file in the docker build

* Change base image for Dockerfile.flower (#1520)

* Change base image for Dockerfile.flower

* Remove platform argument

* Resources bundles dumps (#1505)

* Add a Bundles tab in Resources view

* add dump single and multiple deletion mechanism

* add competition title in bundle name + add competition link in bundle resource tab

* Update datasets.py (flake8)

---------

Co-authored-by: OhMaley <tristanmary2@gmail.com>
Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* Improve formatting

* leaderboard api 500 error resolved (#1527)

* leaderboard api 500 error resolved

* flake issues resolved

* Changed submission name to add ID when downloading many submissions (#1565)

* changed submission name to add ID

* Flake8 white space fix

---------

Co-authored-by: Nicolas HOMBERG <nicolashomberg@gricad-nh.u-ga.fr>

* Server Status:  submissions limit removed (#1562)

* server status submissions limit removed, pagination added, monitor queues separated

* renamed server status title to recent submissions

* Email template fixes (#1567)

* email logo fixed, some changes in email text

* participant side email templates updated

* task dataset/program removal fixed

* Updated docker-compose to docker compose

* whiltelist emails leaking fixed (#1560)

* competition whitelist feature added

* updated whitelist

* Update whitelist note

* whiltelist emails leaking fixed

* Remove conflict

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* Updates to server_status and monitor_queues (#1568)

* server_status and monitor_queues pages secured

* Update monitor_queues.html

* [Feature] Delete orphan files (#1575)

* Add button for orphan files deletion + API routes and views

* Fix flake8 formatting

---------

Co-authored-by: OhMaley <tristanmary2@gmail.com>

* Fix string concat in case of no email in analytics api

* Poetry error tentative fix (#1588)

* Poetry error tentative fix

* RabbitMQ static image in Dockerfile.rabbitmq to fix a recent bug

* Reverted RabbitMQ image change

* Fix Rabbit version

---------

Co-authored-by: Obada Haddad <obada.haddad@lisn.fr>
Co-authored-by: didayolo <adrien.pavao@gmail.com>

* `Release PR#1` - Display release version in Codabench footer (#1583)

* release version added to header

* version moved to footer

* Minor UI change

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* `Release PR#2` Release version will load dynamically from version.json (#1592)

* release version added to header

* version moved to footer

* version on the website is now dynamic and will be loaded from the version.json file

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* `Release PR#3` created workflow for new releases (#1584)

* created workflow for new releases

* version json file added

* typo fix

* Update release-version-update.yml

* Included realease url to navigate user to the url on click on the website

* release json updated

---------

Co-authored-by: Obada Haddad <obada.haddad@lisn.fr>
Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* Updates Sept 15-22 2024 (#1593)

* jinja and pillow

* jinja and pillow

* Adding Versino_Bump_Instruction_README

* Version_Bumps file

* Version_Bumps file and req_treeFile updates

* gunicorn from 20.0.4 to 22.0.0

* Bump requests from 2.20.0 to 2.32.2

* Bump django from 2.2.17 to 2.2.18

* Bump django from 2.2.18 to 2.2.19 and to 3.2.25 eventually

* Bump django from 2.2.19 to 2.2.20

* Bump django from 2.2.20 to 2.2.25

* Bump django from 2.2.25 to 2.2.28

* Bump django from 2.2.25 to 2.2.28

* Version_Bumps.md text

* Update Dockerfile (upgrade Python)

* checking in some outstanding changes

* Remove Version Bumps

* removing version bumbs

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* organizers can now delete forum posts (#1613)

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

* bundles renamed to competition bundles, swapped postions of bundles and tasks (#1591)

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>

---------

Co-authored-by: Ihsan Ullah <ihsan2131@gmail.com>
Co-authored-by: Nicolas HOMBERG <nicolashomberg@gricad-nh.u-ga.fr>
Co-authored-by: OhMaley <tristanmary2@gmail.com>
Co-authored-by: Obada Haddad <obada.haddad@lisn.fr>
Co-authored-by: Obada Haddad-Soussac <osobada.03@hotmail.fr>
Co-authored-by: Benjamin Bearce <bbearce@gmail.com>
@bbearce bbearce mentioned this pull request Nov 19, 2024
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants