Skip to content

Commit e87d0dd

Browse files
noor1027noor1027
authored
BB2-3258 Web server Python Upgrade to 3.11.9 (#1246)
* python upgrade * Update Jenkinsfile.cbc-run-multi-pr-checks-w-selenium * removed cp38 * Update docker-compose.selenium.remote.yml * Update Jenkinsfile.cbc-run-multi-pr-checks-w-selenium
1 parent 7f7a5e5 commit e87d0dd

26 files changed

+118
-154
lines changed

‎Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM --platform=linux/amd64 python:3.8
1+
FROM --platform=linux/amd64 python:3.11
22
ENV PYTHONUNBUFFERED 1
3+
ENV PYDEVD_DISABLE_FILE_VALIDATION 1
34
RUN useradd -m -s /bin/bash DEV
45
USER DEV
56
ADD . /code

‎Dockerfile.selenium

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM seleniarm/standalone-chromium
22

33
ENV PYTHONUNBUFFERED 1
44
USER root
5-
RUN apt-get update ; apt-get install -yq git curl libpq-dev libffi-dev
5+
#RUN apt-get update ; apt-get install -yq git curl libpq-dev libffi-dev
66
RUN apt-get update ; apt-get install -yq python3 python3-venv
77
RUN ln -s /usr/bin/python3 /usr/local/bin/python
88
RUN useradd -m -s /bin/bash DEV

‎Dockerfiles/Dockerfile.selenium-jenkins-python311

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM --platform=linux/amd64 python:3.11
2+
# For build CBC Jenkins job ECR image
3+
ENV PYTHONUNBUFFERED 1
4+
5+
RUN mkdir /code
6+
ADD . /code/
7+
WORKDIR /code
8+
9+
RUN pip install --upgrade pip
10+
RUN apt-get update && apt-get install -yq git unzip curl
11+
# Install Chrome for Selenium
12+
RUN curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb \
13+
&& dpkg -i /chrome.deb || apt-get install -yf \
14+
&& rm /chrome.deb
15+
# Install chromedriver for Selenium
16+
RUN wget -O /tmp/chromedriver.zip http://chromedriver.storage.googleapis.com/`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE`/chromedriver_linux64.zip \
17+
&& unzip /tmp/chromedriver.zip chromedriver -d /usr/local/bin/ \
18+
&& chmod +x /usr/local/bin/chromedriver

‎Jenkinsfiles/Jenkinsfile.cbc-run-multi-pr-checks-w-selenium

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
pipeline {
22
agent {
33
kubernetes {
4-
defaultContainer "bb2-cbc-build-selenium-python38"
5-
yamlFile "Jenkinsfiles/cbc-pod-deployment-config-w-selenium-p38.yaml"
4+
defaultContainer "bb2-cbc-build-selenium-python311"
5+
yamlFile "Jenkinsfiles/cbc-pod-deployment-config-w-selenium-p311.yaml"
66
}
77
}
88

99
environment {
10-
USE_MSLSX = false
10+
USE_MSLSX = true
1111
DJANGO_LOG_JSON_FORMAT_PRETTY = true
1212
DJANGO_SETTINGS_MODULE = "hhs_oauth_server.settings.logging_it"
1313
OAUTHLIB_INSECURE_TRANSPORT = true
@@ -55,6 +55,7 @@ pipeline {
5555
sh """
5656
python -m venv venv
5757
. venv/bin/activate
58+
python -m pip install --upgrade pip setuptools wheel cryptography
5859
make reqs-download
5960
make reqs-install-dev
6061
"""

‎Jenkinsfiles/cbc-pod-deployment-config-w-selenium-p311.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: v1
2+
kind: Pod
3+
spec:
4+
containers:
5+
- name: bb2-cbc-build-selenium-python311
6+
image: "public.ecr.aws/f5g8o1y9/bb2-cbc-build-selenium-python311:latest"
7+
tty: true
8+
command: ["tail", "-f"]
9+
imagePullPolicy: Always
10+
nodeSelector:
11+
Agents: true

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ reqs-compile:
44

55
# Note: requirements.dev.txt includes packages from requirements.txt also.
66
reqs-download:
7-
pip download -r requirements/requirements.dev.txt --dest vendor --platform manylinux2014_x86_64 --abi cp38 --no-deps
7+
pip download -r requirements/requirements.dev.txt --dest vendor --platform manylinux2014_x86_64 --abi cp311 --no-deps
88

99
#Note: Only installs prod requirements NOT RECOMMENDED FOR DEVELOPMENT.
1010
reqs-download-prod:
11-
pip download -r requirements/requirements.txt --dest vendor --platform manylinux2014_x86_64 --abi cp38 --no-deps
11+
pip download -r requirements/requirements.txt --dest vendor --platform manylinux2014_x86_64 --abi cp311 --no-deps
1212

1313
reqs-install:
1414
pip install -r requirements/requirements.txt --no-index --find-links ./vendor/

‎dev-local/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM python:3.7.13
1+
FROM python:3.11
2+
ENV PYDEVD_DISABLE_FILE_VALIDATION 1
23
RUN useradd -m -s /bin/bash DEVLOCAL
34
USER DEVLOCAL
45
ADD . /code

‎docker-compose.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
services:
22
msls:
33
build: ./dev-local
4-
command: bash -c "python -m debugpy --listen 0.0.0.0:7890 app.py"
4+
command: bash -c "python app.py"
55
ports:
66
- "8080:8080"
7-
- "7890:7890"
87
profiles:
98
- mocksls
109
db:

‎requirements/requirements.dev.txt

+38-78
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.8
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile --generate-hashes --output-file=requirements/requirements.dev.txt requirements/requirements.dev.in
@@ -16,27 +16,6 @@ attrs==23.1.0 \
1616
# jsonschema
1717
# outcome
1818
# trio
19-
backports-zoneinfo==0.2.1 \
20-
--hash=sha256:17746bd546106fa389c51dbea67c8b7c8f0d14b5526a579ca6ccf5ed72c526cf \
21-
--hash=sha256:1b13e654a55cd45672cb54ed12148cd33628f672548f373963b0bff67b217328 \
22-
--hash=sha256:1c5742112073a563c81f786e77514969acb58649bcdf6cdf0b4ed31a348d4546 \
23-
--hash=sha256:4a0f800587060bf8880f954dbef70de6c11bbe59c673c3d818921f042f9954a6 \
24-
--hash=sha256:5c144945a7752ca544b4b78c8c41544cdfaf9786f25fe5ffb10e838e19a27570 \
25-
--hash=sha256:7b0a64cda4145548fed9efc10322770f929b944ce5cee6c0dfe0c87bf4c0c8c9 \
26-
--hash=sha256:8439c030a11780786a2002261569bdf362264f605dfa4d65090b64b05c9f79a7 \
27-
--hash=sha256:8961c0f32cd0336fb8e8ead11a1f8cd99ec07145ec2931122faaac1c8f7fd987 \
28-
--hash=sha256:89a48c0d158a3cc3f654da4c2de1ceba85263fafb861b98b59040a5086259722 \
29-
--hash=sha256:a76b38c52400b762e48131494ba26be363491ac4f9a04c1b7e92483d169f6582 \
30-
--hash=sha256:da6013fd84a690242c310d77ddb8441a559e9cb3d3d59ebac9aca1a57b2e18bc \
31-
--hash=sha256:e55b384612d93be96506932a786bbcde5a2db7a9e6a4bb4bffe8b733f5b9036b \
32-
--hash=sha256:e81b76cace8eda1fca50e345242ba977f9be6ae3945af8d46326d776b4cf78d1 \
33-
--hash=sha256:e8236383a20872c0cdf5a62b554b27538db7fa1bbec52429d8d106effbaeca08 \
34-
--hash=sha256:f04e857b59d9d1ccc39ce2da1021d196e47234873820cbeaad210724b1ee28ac \
35-
--hash=sha256:fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2
36-
# via
37-
# -r requirements/requirements.in
38-
# django
39-
# djangorestframework
4019
beautifulsoup4==4.12.2 \
4120
--hash=sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da \
4221
--hash=sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a
@@ -217,39 +196,39 @@ configparser==5.3.0 \
217196
--hash=sha256:8be267824b541c09b08db124917f48ab525a6c3e837011f3130781a224c57090 \
218197
--hash=sha256:b065779fd93c6bf4cee42202fa4351b4bb842e96a3fb469440e484517a49b9fa
219198
# via -r requirements/requirements.in
220-
cryptography==42.0.7 \
221-
--hash=sha256:02c0eee2d7133bdbbc5e24441258d5d2244beb31da5ed19fbb80315f4bbbff55 \
222-
--hash=sha256:0d563795db98b4cd57742a78a288cdbdc9daedac29f2239793071fe114f13785 \
223-
--hash=sha256:16268d46086bb8ad5bf0a2b5544d8a9ed87a0e33f5e77dd3c3301e63d941a83b \
224-
--hash=sha256:1a58839984d9cb34c855197043eaae2c187d930ca6d644612843b4fe8513c886 \
225-
--hash=sha256:2954fccea107026512b15afb4aa664a5640cd0af630e2ee3962f2602693f0c82 \
226-
--hash=sha256:2e47577f9b18723fa294b0ea9a17d5e53a227867a0a4904a1a076d1646d45ca1 \
227-
--hash=sha256:31adb7d06fe4383226c3e963471f6837742889b3c4caa55aac20ad951bc8ffda \
228-
--hash=sha256:3577d029bc3f4827dd5bf8bf7710cac13527b470bbf1820a3f394adb38ed7d5f \
229-
--hash=sha256:36017400817987670037fbb0324d71489b6ead6231c9604f8fc1f7d008087c68 \
230-
--hash=sha256:362e7197754c231797ec45ee081f3088a27a47c6c01eff2ac83f60f85a50fe60 \
231-
--hash=sha256:3de9a45d3b2b7d8088c3fbf1ed4395dfeff79d07842217b38df14ef09ce1d8d7 \
232-
--hash=sha256:4f698edacf9c9e0371112792558d2f705b5645076cc0aaae02f816a0171770fd \
233-
--hash=sha256:5482e789294854c28237bba77c4c83be698be740e31a3ae5e879ee5444166582 \
234-
--hash=sha256:5e44507bf8d14b36b8389b226665d597bc0f18ea035d75b4e53c7b1ea84583cc \
235-
--hash=sha256:779245e13b9a6638df14641d029add5dc17edbef6ec915688f3acb9e720a5858 \
236-
--hash=sha256:789caea816c6704f63f6241a519bfa347f72fbd67ba28d04636b7c6b7da94b0b \
237-
--hash=sha256:7f8b25fa616d8b846aef64b15c606bb0828dbc35faf90566eb139aa9cff67af2 \
238-
--hash=sha256:8cb8ce7c3347fcf9446f201dc30e2d5a3c898d009126010cbd1f443f28b52678 \
239-
--hash=sha256:93a3209f6bb2b33e725ed08ee0991b92976dfdcf4e8b38646540674fc7508e13 \
240-
--hash=sha256:a3a5ac8b56fe37f3125e5b72b61dcde43283e5370827f5233893d461b7360cd4 \
241-
--hash=sha256:a47787a5e3649008a1102d3df55424e86606c9bae6fb77ac59afe06d234605f8 \
242-
--hash=sha256:a79165431551042cc9d1d90e6145d5d0d3ab0f2d66326c201d9b0e7f5bf43604 \
243-
--hash=sha256:a987f840718078212fdf4504d0fd4c6effe34a7e4740378e59d47696e8dfb477 \
244-
--hash=sha256:a9bc127cdc4ecf87a5ea22a2556cab6c7eda2923f84e4f3cc588e8470ce4e42e \
245-
--hash=sha256:bd13b5e9b543532453de08bcdc3cc7cebec6f9883e886fd20a92f26940fd3e7a \
246-
--hash=sha256:c65f96dad14f8528a447414125e1fc8feb2ad5a272b8f68477abbcc1ea7d94b9 \
247-
--hash=sha256:d8e3098721b84392ee45af2dd554c947c32cc52f862b6a3ae982dbb90f577f14 \
248-
--hash=sha256:e6b79d0adb01aae87e8a44c2b64bc3f3fe59515280e00fb6d57a7267a2583cda \
249-
--hash=sha256:e6b8f1881dac458c34778d0a424ae5769de30544fc678eac51c1c8bb2183e9da \
250-
--hash=sha256:e9b2a6309f14c0497f348d08a065d52f3020656f675819fc405fb63bbcd26562 \
251-
--hash=sha256:ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2 \
252-
--hash=sha256:efd0bf5205240182e0f13bcaea41be4fdf5c22c5129fc7ced4a0282ac86998c9
199+
cryptography==42.0.8 \
200+
--hash=sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad \
201+
--hash=sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583 \
202+
--hash=sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b \
203+
--hash=sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c \
204+
--hash=sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1 \
205+
--hash=sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648 \
206+
--hash=sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949 \
207+
--hash=sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba \
208+
--hash=sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c \
209+
--hash=sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9 \
210+
--hash=sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d \
211+
--hash=sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c \
212+
--hash=sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e \
213+
--hash=sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2 \
214+
--hash=sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d \
215+
--hash=sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7 \
216+
--hash=sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70 \
217+
--hash=sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2 \
218+
--hash=sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7 \
219+
--hash=sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14 \
220+
--hash=sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe \
221+
--hash=sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e \
222+
--hash=sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71 \
223+
--hash=sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961 \
224+
--hash=sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7 \
225+
--hash=sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c \
226+
--hash=sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28 \
227+
--hash=sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842 \
228+
--hash=sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902 \
229+
--hash=sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801 \
230+
--hash=sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a \
231+
--hash=sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e
253232
# via
254233
# -r requirements/requirements.in
255234
# jwcrypto
@@ -354,13 +333,6 @@ djangorestframework==3.15.2 \
354333
djangorestframework-csv==2.1.1 \
355334
--hash=sha256:aa0ee4c894fe319c68e042b05c61dace43a9fb6e6872e1abe1724ca7ea4d15f7
356335
# via -r requirements/requirements.in
357-
exceptiongroup==1.2.1 \
358-
--hash=sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad \
359-
--hash=sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16
360-
# via
361-
# pytest
362-
# trio
363-
# trio-websocket
364336
flake8==6.0.0 \
365337
--hash=sha256:3833794e27ff64ea4e9cf5d410082a8b97ff1a06c16aa3d2027339cd0f1195c7 \
366338
--hash=sha256:c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181
@@ -392,15 +364,11 @@ idna==3.7 \
392364
importlib-metadata==6.6.0 \
393365
--hash=sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed \
394366
--hash=sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705
395-
# via
396-
# -r requirements/requirements.in
397-
# flask
367+
# via -r requirements/requirements.in
398368
importlib-resources==5.12.0 \
399369
--hash=sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6 \
400370
--hash=sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a
401-
# via
402-
# -r requirements/requirements.in
403-
# jsonschema
371+
# via -r requirements/requirements.in
404372
iniconfig==2.0.0 \
405373
--hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
406374
--hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
@@ -606,9 +574,7 @@ pillow==10.3.0 \
606574
pkgutil-resolve-name==1.3.10 \
607575
--hash=sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174 \
608576
--hash=sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e
609-
# via
610-
# -r requirements/requirements.in
611-
# jsonschema
577+
# via -r requirements/requirements.in
612578
pluggy==1.5.0 \
613579
--hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
614580
--hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
@@ -855,10 +821,6 @@ sqlparse==0.5.0 \
855821
# -r requirements/requirements.in
856822
# django
857823
# django-debug-toolbar
858-
tomli==2.0.1 \
859-
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
860-
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
861-
# via pytest
862824
trio==0.24.0 \
863825
--hash=sha256:c3bd3a4e3e3025cd9a2241eae75637c43fe0b9e88b4c97b9161a55b9e54cd72c \
864826
--hash=sha256:ffa09a74a6bf81b84f8613909fb0beaee84757450183a7a2e0b47b455c0cac5d
@@ -906,9 +868,7 @@ wtforms==3.1.2 \
906868
zipp==3.19.2 \
907869
--hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
908870
--hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
909-
# via
910-
# importlib-metadata
911-
# importlib-resources
871+
# via importlib-metadata
912872

913873
# WARNING: The following packages were not pinned, but pip requires them to be
914874
# pinned when the requirements file includes hashes and the requirement is not

‎requirements/requirements.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ django-axes
1212
# support
1313
beautifulsoup4 == 4.12.2
1414
soupsieve == 2.4.1
15-
backports.zoneinfo
15+
1616
django-waffle
1717
django-storages
1818
django-getenv
@@ -49,5 +49,5 @@ django-ses
4949
oauthlib
5050
## python-openid
5151
django-oauth-toolkit
52-
cryptography >= 42.0.6
52+
cryptography >= 42.0.8
5353
jwcrypto

0 commit comments

Comments
 (0)