Skip to content

Commit c65f31f

Browse files
authored
Merge pull request #1261 from OasisLMF/release/1.28.15
Release 1.28.15
2 parents 71ab1db + 40583bd commit c65f31f

15 files changed

+817
-418
lines changed

.github/workflows/test-images.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ env:
3232
pre_release: 'true' # look for pre-release when testing last released platform version
3333
semver_major: '1' # Search for published images but limited to {semvar_major}.x.x
3434
semver_minor: '28' # Search for published images but limited to x.{semvar_minor}.x
35+
server_min_supported: '1.28.0'
3536

3637
jobs:
3738
build_images:
@@ -55,6 +56,7 @@ jobs:
5556
release_stable_15: ${{ steps.released_images.outputs.stable_15 }}
5657
release_stable_23: ${{ steps.released_images.outputs.stable_23 }}
5758
release_stable_27: ${{ steps.released_images.outputs.stable_27 }}
59+
server_min_supported: ${{ env.server_min_supported }}
5860

5961
build_server_img: ${{ steps.built_images.outputs.server_img }}
6062
build_server_tag: ${{ steps.built_images.outputs.server_tag }}
@@ -238,3 +240,19 @@ jobs:
238240
debug_mode: 1
239241
pytest_opts: "--docker-compose=./docker/s3.docker-compose.yml ${{ needs.setup.outputs.pytest_opts }}"
240242
storage_suffix: '_s3'
243+
244+
stable_server:
245+
name: test stable server (${{ needs.setup.outputs.server_min_supported }})
246+
secrets: inherit
247+
needs: [setup]
248+
uses: OasisLMF/OasisPiWind/.github/workflows/integration.yml@main
249+
with:
250+
piwind_branch: 'stable/1.28.x'
251+
server_image: 'coreoasis/api_server'
252+
server_tag: ${{ needs.setup.outputs.server_min_supported }}
253+
worker_image: ${{ needs.setup.outputs.build_worker_img }}
254+
worker_tag: ${{ needs.setup.outputs.build_worker_tag }}
255+
debug_mode: 1
256+
pytest_opts: ${{ needs.setup.outputs.pytest_opts }}
257+
storage_suffix: "_server-${{ needs.setup.outputs.server_min_supported }}_v1"
258+

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
OasisPlatform Changelog
22
=======================
33

4+
`1.28.15`_
5+
---------
6+
* [#1244](https://github.com/OasisLMF/OasisPlatform/pull/1245) - CVE fix request for stable 1.28.x
7+
* [#1247](https://github.com/OasisLMF/OasisPlatform/pull/1253) - Test older server images with latest build of workers (both V1 / V2)
8+
.. _`1.28.15`: https://github.com/OasisLMF/OasisPlatform/compare/1.28.14...1.28.15
9+
410
.. _`1.28.14`: https://github.com/OasisLMF/OasisPlatform/compare/1.28.13...1.28.14
511

612
* [#1190](https://github.com/OasisLMF/OasisPlatform/pull/1190) - Stable/1.28.x - Allianz - Celery DB authentication with Azure Service Principal

Dockerfile.api_server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ USER server
2020
FROM ubuntu:22.04
2121
RUN apt-get update \
2222
&& apt-get upgrade -y \
23-
&& apt-get install -y --no-install-recommends sudo python3 python3-pkg-resources curl libmariadbclient-dev-compat \
23+
&& apt-get install -y --no-install-recommends python3 python3-pkg-resources curl libmariadbclient-dev-compat \
2424
&& rm -rf /var/lib/apt/lists/
2525

2626
RUN adduser --home /home/server --shell /bin/bash --disabled-password --gecos "" server

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.28.14
1+
1.28.15

requirements-server.in

100755100644
Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
boto3
2-
celery
3-
chainmap
4-
channels
5-
configparser
6-
coreapi
7-
daphne
8-
django
9-
django-cleanup
10-
django-filter
1+
boto3>=1.0,<2.0
2+
celery>=5.0,<6.0
3+
chainmap>=1.0,<2.0
4+
channels>=4.0,<5.0
5+
configparser>=5.0,<6.0
6+
coreapi>=2.0,<3.0
7+
daphne>=4.0,<5.0
8+
django>=3.0,<4.0
9+
django-cleanup>=7.0,<8.0
10+
django-filter>=22.0,<23.0
1111
django-model-utils>=4.0.0
12-
django-storages[azure]
13-
django-request-logging
14-
django-debug-toolbar
15-
djangorestframework
12+
django-storages[azure]>=1.0,<2.0
13+
django-request-logging>=0.0,<1.0
14+
django-debug-toolbar>=3.0,<4.0
15+
djangorestframework>=3.0,<4.0
1616
djangorestframework_simplejwt
17-
drf-nested-routers
18-
drf-yasg>=1.17.1
19-
jsonpickle
20-
jsonschema
21-
markdown
22-
ods_tools
23-
pandas
24-
pathlib2
25-
psycopg2-binary
26-
pyarrow
27-
pymysql
28-
sqlalchemy
29-
mysqlclient
30-
whitenoise
17+
drf-nested-routers>=0.0,<1.0
18+
drf-yasg>=1.17.1,<=1.21.5
19+
jsonpickle>=3.0,<4.0
20+
jsonschema>=4.0,<5.0
21+
markdown>=3.0,<4.0
22+
pandas>=1.0,<2.0
23+
numpy>=1.0,<2.0
24+
pathlib2>=2.0,<3.0
25+
psycopg2-binary>=2.0,<3.0
26+
pyarrow>=14.0,<15.0
27+
pymysql>=1.0,<2.0
28+
sqlalchemy>=2.0,<3.0
29+
mysqlclient>=2.0,<2.2
30+
whitenoise>=6.0,<7.0
3131
twisted>=22.1
32-
gunicorn
33-
azure-identity
32+
gunicorn>=23.0,<24.0
33+
azure-identity>=1.0,<2.0
34+
ods-tools<3.2.0

0 commit comments

Comments
 (0)