Skip to content

[OSDEV-1785] Link to the forked aiokafka@0.8.0 #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vladsha-dev merged 3 commits into from
Feb 24, 2025
Merged

[OSDEV-1785] Link to the forked aiokafka@0.8.0 #534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68ee7b8
Link to the forked aiokafka@0.8.0
VadimKovalenkoSNF Feb 24, 2025
e8762e8
Link to opensupplyhub organisation forked repo
VadimKovalenkoSNF Feb 24, 2025
7ef6133
Update release notes
VadimKovalenkoSNF Feb 24, 2025
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
39 changes: 4 additions & 35 deletions doc/release/RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,11 @@ All notable changes to this project will be documented in this file.

This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). The format is based on the `RELEASE-NOTES-TEMPLATE.md` file.

## Release 2.1.0
## Release 1.30.0

## Introduction
* Product name: Open Supply Hub
* Release date: March 8, 2025

### Database changes
* *Describe high-level database changes.*

#### Migrations:
* *Describe migrations here.*

#### Schema changes
* *Describe schema changes here.*

### Code/API changes
* *Describe code/API changes here.*

### Architecture/Environment changes
* [OSDEV-1580](https://opensupplyhub.atlassian.net/browse/OSDEV-1580) - The new architecture diagram of the OS Hub platform has been created in response to the penetration testing that will be conducted in February 2025. The diagram has been placed in the root of the `./doc/system_design/` folder, replacing the old diagrams that have been moved to the `./doc/system_design/archived/` folder as they are no longer valid. A new `./doc/system_design/README.md` file has also been created, with a reference to the new architecture/network diagram.

### Bugfix
* [OSDEV-1745](https://opensupplyhub.atlassian.net/browse/OSDEV-1745) - The `Search by Name and Address` tab was defined as default on the Production Location Search page.

### What's new
* *Describe what's new here. The changes that can impact user experience should be listed in this section.*

### Release instructions:
* Ensure that the following commands are included in the `post_deployment` command:
* `migrate`
* `reindex_database`


## Release 2.0.0

## Introduction
* Product name: Open Supply Hub
* Release date: February 22, 2025
* Release date: March 01, 2025

### Database changes
* [OSDEV-1662](https://opensupplyhub.atlassian.net/browse/OSDEV-1662) - Added a new field, `action_perform_by`, to the `api_moderationevent` table so we can handle and store moderation actions user data.
Expand All @@ -64,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
### Architecture/Environment changes
* [OSDEV-1515](https://opensupplyhub.atlassian.net/browse/OSDEV-1515) - Removed `rds_allow_major_version_upgrade` and `rds_apply_immediately` from the environment tfvars files (e.g., terraform-production.tfvars) to set them to `false` again, as the default values in `/deployment/terraform/variables.tf` are `false`. This is necessary to prevent unintended PostgreSQL major version upgrades since the target PostgreSQL 16.3 version has been reached.
* [OSDEV-1692](https://opensupplyhub.atlassian.net/browse/OSDEV-1692) - Update cache dependencies due to Ubuntu 20 image runner deprecation. See [link](https://github.blog/changelog/2024-12-05-notice-of-upcoming-releases-and-breaking-changes-for-github-actions/#actions-cache-v1-v2-and-actions-toolkit-cache-package-closing-down).
* [OSDEV-1580](https://opensupplyhub.atlassian.net/browse/OSDEV-1580) - The new architecture diagram of the OS Hub platform has been created in response to the penetration testing that will be conducted in February 2025. The diagram has been placed in the root of the `./doc/system_design/` folder, replacing the old diagrams that have been moved to the `./doc/system_design/archived/` folder as they are no longer valid. A new `./doc/system_design/README.md` file has also been created, with a reference to the new architecture/network diagram.

### Bugfix
* [OSDEV-1698](https://opensupplyhub.atlassian.net/browse/OSDEV-1698) - SLC: Refactored the "Submit Another Location" button link to direct users to the search-by-name-and-address form at /contribute/single-location?tab=name-address.
Expand All @@ -80,6 +48,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
* [OSDEV-1739](https://opensupplyhub.atlassian.net/browse/OSDEV-1739) - Applied state cleanup on modal unmount to prevent the same dialog from appearing when clicking on a different production location.
* [OSDEV-1744](https://opensupplyhub.atlassian.net/browse/OSDEV-1744) - Fixed the issue where the text `by user ID:` appeared even when `user_id` was `null` in Contribution Record page.
* [OSDEV-1779](https://opensupplyhub.atlassian.net/browse/OSDEV-1779) - SLC. Made Parent Company field as regular text field and apply snake_case keys to standard keys (e.g. `location_type`, `number_of_workers`, `parent_company`, `processing_type` and `product_type`) in request payload from production location info page to conform API specs.
* [OSDEV-1745](https://opensupplyhub.atlassian.net/browse/OSDEV-1745) - The `Search by Name and Address` tab was defined as default on the Production Location Search page.

### What's new
* [OSDEV-1662](https://opensupplyhub.atlassian.net/browse/OSDEV-1662) - Added a new field, `action_perform_by`, to the moderation event. This data appears on the Contribution Record page when a moderator perform any actions like `APPROVED` or `REJECTED`.
Expand Down
3 changes: 1 addition & 2 deletions doc/release/RELEASE-PROTOCOL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ This document outlines the SDLC pillars of the opensupplyhub monorepo, as well a
| v1.27.0 | January 11, 2025 | January 7, 2025 | @Nessa Drew |
| v1.28.0 | January 25, 2025 | January 21, 2025 | @Vlad Shapik |
| v1.29.0 | February 8, 2025 | February 4, 2025 | @Vlad Shapik |
| v2.0.0 | February 22, 2025 | February 18, 2025 | @Vadim Kovalenko |
| v2.1.0 | March 8, 2025 | March 4, 2025 | @Vadim Kovalenko |
| v1.30.0 | March 1, 2025 | February 25, 2025 | @Vadim Kovalenko |

## General Information

Expand Down
9 changes: 8 additions & 1 deletion src/django/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ RUN mkdir -p /usr/local/src/static/static
WORKDIR /usr/local/src

COPY requirements.txt /usr/local/src/

# [OSDEV-1785][https://github.com/aio-libs/aiokafka/issues/1093] - Remove aiokafka in requirements.txt to avoid conflicts.
RUN sed -i '/aiokafka/d' requirements.txt

RUN set -ex \
&& buildDeps=" \
build-essential \
Expand All @@ -13,11 +17,14 @@ RUN set -ex \
gdal-bin \
gettext \
postgresql-client-15 \
git \
" \
&& apt-get update && apt-get install -y $buildDeps $deps --no-install-recommends \
&& pip install --no-cache-dir -r requirements.txt \
# [OSDEV-1785][https://github.com/aio-libs/aiokafka/issues/1093] - Install aiokafka from the custom repo.
&& pip install --no-cache-dir git+https://github.com/VadimKovalenkoSNF/aiokafka.git@kafka-python-2.0.3 \
&& apt-get purge -y --auto-remove $buildDeps \
&& rm -rf /usr/local/src/requirements.txt /var/lib/apt/lists/*
&& rm -rf /usr/local/src/requirements.txt /var/lib/apt/lists/*

COPY . /usr/local/src

Expand Down
Loading