From 4bc63cc6a638d759aa2793c7e210eaa3759915bc Mon Sep 17 00:00:00 2001 From: adRn-s Date: Fri, 13 Sep 2024 12:04:12 +0200 Subject: [PATCH] simple fixes --- CHANGELOG.md | 12 +++++++++++- backend.Dockerfile | 4 ++-- backend/requirements/3.12/base.in | 1 + backend/requirements/3.12/dev.in | 1 + backend/requirements/3.12/prod.in | 1 + backend/requirements/3.12/testing.in | 1 + 6 files changed, 17 insertions(+), 3 deletions(-) create mode 120000 backend/requirements/3.12/base.in create mode 120000 backend/requirements/3.12/dev.in create mode 120000 backend/requirements/3.12/prod.in create mode 120000 backend/requirements/3.12/testing.in diff --git a/CHANGELOG.md b/CHANGELOG.md index bc995a5f7..aaa83e6b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,13 @@ - TODO: `/export_request/` and `/import_request/` both have a simple UI - ... + 24.08.20 ======== Breaking changes: -- Temporarily dropped CI tests for Python 3.12, which were [broken via Numpy dependency](https://https://numpy.org/doc/stable//release/1.26.0-notes.html)). We're using Python 3.11 since Parkour2 version 0.3.9 anyway. We'll catch-up to Python 3.12 once the situation stabilizes and other projects are successful sailing through this difficulty... For now, our `requirements.txt` environment is unable to resolve under 3.12 +- Temporarily dropped CI tests for Python 3.12, which were [broken via Numpy dependency](https://numpy.org/doc/stable//release/1.26.0-notes.html)). We're using Python 3.11 since Parkour2 version 0.3.9 anyway. We'll catch-up to Python 3.12 once the situation stabilizes and other projects are successful sailing through this difficulty... For now, our `requirements.txt` environment is unable to resolve under 3.12 Non-breaking changes: @@ -19,6 +20,7 @@ Non-breaking changes: - New retrieve_samplesheet API endpoint under flowcells. By default, it gets you the XLSX samplesheet containing all lanes of a flowcell. For example, `/api/flowcells/retrieve_samplesheet/?flowcell_id=...` - Dropped pip cache (experimental Dockerfile syntax) to avoid obscure error messages. We are dealing with these (and other pkg caches) by using a cronjob that runs the build in the VMs. + 24.07.24 ======== @@ -27,6 +29,7 @@ Non-breaking changes: - Dev deployments now have an integrated tool available for generating, saving, and running SQL queries: [SQL Explorer](https://www.sqlexplorer.io) (use: `make enable-explorer` to activate, and then navigate to `/explorer`.) - Updated all of our Python package dependencies. + 24.06.28 ======== @@ -37,6 +40,7 @@ Non-breaking changes: - Option to select OS under "File Paths" to modify the file paths according to the selection. (#113) - Feature to add paths from the user's end, via "User Paths" in File Path right-click option. (#117) + 24.05.10 ======== @@ -51,6 +55,7 @@ Non-breaking changes: - Changed the naming format of Benchtop Protocol File in 'Library Preparation' and 'Pooling' to have the 'Request IDs' and 'Pool ID' in front. (#105) - New Benchtop Protocol File in 'Pooling' with the introduction of 'Smear Analysis' (#107) + 24.03.27 ======== @@ -60,6 +65,7 @@ Non-breaking changes: - While downloading, renamed the Benchtop Protocol File in 'Library Preparation' and 'Pooling' to have the 'Request IDs' and 'Pool ID' respectively. (#102) - BugFix: Fixed various costs in 'Invoicing' appear as 0. (#103) + 24.03.15 ======== @@ -70,6 +76,7 @@ Non-breaking changes: - Rephrased text in email sent after Electronic Approval. - Added Seq. Length and Depth to Electronic Approval. Old PDF was not updated (yet) because of reasons. + 24.02.20 ======== @@ -81,6 +88,7 @@ Non-breaking changes: - new nucleic acid and library protocol types for single cell sequencing. - `put-old-migras` and `sweep` rules are more robust now. + 24.01.31 ======== @@ -139,6 +147,7 @@ Non-breaking changes: - Added an EmailField to PrincipalInvestigator. This field is going to be used in the 'paperless approval' feature (see next release.) - Added new endpoint, `/api/requests//get_poolpaths/`, returns a dictionary with records' barcode as keys and pool names as values, to easily find where each sample (or lib) was loaded. + 23.09.20 ======== @@ -209,6 +218,7 @@ Non-breaking changes: - Submission of sample and libraries updated, we are hardcoding values for columns that are now hidden in frontend (e.g. concentration_method and RQN). Like always, custom parameters and its values can be passed in the free-text form inside Description or using file attachments to each request. + 0.3.9 ===== diff --git a/backend.Dockerfile b/backend.Dockerfile index e8d11f8ba..d7549de2f 100644 --- a/backend.Dockerfile +++ b/backend.Dockerfile @@ -1,4 +1,4 @@ -ARG PyVersion=3.11 +ARG PyVersion=3.11 # to be repeated after FROM, docker syntax is at fault. FROM python:${PyVersion}-bullseye AS pk2_base ENV \ @@ -27,7 +27,7 @@ WORKDIR /usr/src/app COPY ./backend . EXPOSE 8000 ENV DJANGO_SETTINGS_MODULE=wui.settings.prod -ARG PyVersion=3.11 +ARG PyVersion=3.11 # yeah, repeated. docker syntax is at fault. RUN pip install -r requirements/${PyVersion}/base.txt CMD ["gunicorn", "wui.wsgi:application", "--name=parkour2", "--timeout=600", "--workers=4", "--bind=0.0.0.0:8000"] diff --git a/backend/requirements/3.12/base.in b/backend/requirements/3.12/base.in new file mode 120000 index 000000000..6e90c7f28 --- /dev/null +++ b/backend/requirements/3.12/base.in @@ -0,0 +1 @@ +../base.in \ No newline at end of file diff --git a/backend/requirements/3.12/dev.in b/backend/requirements/3.12/dev.in new file mode 120000 index 000000000..41a5c8e11 --- /dev/null +++ b/backend/requirements/3.12/dev.in @@ -0,0 +1 @@ +../dev.in \ No newline at end of file diff --git a/backend/requirements/3.12/prod.in b/backend/requirements/3.12/prod.in new file mode 120000 index 000000000..9655cb581 --- /dev/null +++ b/backend/requirements/3.12/prod.in @@ -0,0 +1 @@ +../prod.in \ No newline at end of file diff --git a/backend/requirements/3.12/testing.in b/backend/requirements/3.12/testing.in new file mode 120000 index 000000000..73d0b967d --- /dev/null +++ b/backend/requirements/3.12/testing.in @@ -0,0 +1 @@ +../testing.in \ No newline at end of file