Skip to content

Commit 9ddf8dc

Browse files
JohnPrestonJohnPreston
authored
Dependencies updates (#819)
* Dependencies updates * flatdict to flatdict3 patched up * minimum python version to 3.10 * patched up use case test files lookup for remaining resources * Removed pyupgrade as there is now better * Updates on coebuild
1 parent 5dd4e5b commit 9ddf8dc

61 files changed

Lines changed: 1194 additions & 1777 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cicd/buildspec_image.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ phases:
2525
- SUFFIX=${COMMIT_HASH:=$EPOCH}
2626
- if [ $USE_EPOCH -eq 1 ]; then SUFFIX=$EPOCH; fi
2727
- |
28-
if ! [ -z "${CODEBUILD_WEBHOOK_TRIGGER+x}" ]; then
29-
echo TRIGGER is $CODEBUILD_WEBHOOK_TRIGGER
30-
PRE=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 1`;
31-
echo PRE is $PRE
32-
echo SUFFIX is $SUFFIX
33-
if [ "${PRE}" == "tag" ]; then SUFFIX=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 2`; TAG_RELEASE=1 ; fi
34-
fi
28+
if ! [ -z "${CODEBUILD_WEBHOOK_TRIGGER+x}" ]; then
29+
echo TRIGGER is $CODEBUILD_WEBHOOK_TRIGGER
30+
PRE=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 1`;
31+
echo PRE is $PRE
32+
echo SUFFIX is $SUFFIX
33+
if [ "${PRE}" == "tag" ]; then SUFFIX=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 2`; TAG_RELEASE=1 ; fi
34+
fi
3535
- echo SUFFIX ends up being $SUFFIX
3636
- pip install docker-compose -U
3737

‎.cicd/buildspec_layer.yml‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.cicd/buildspec_layers.yml‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎.cicd/buildspec_manifest.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ batch:
1717
compute-type: BUILD_GENERAL1_SMALL
1818
privileged-mode: true
1919
variables:
20-
VERSION: 3.10
20+
VERSION: &py-version 3.10
2121
ARCH: amd64
2222
buildspec: .cicd/buildspec_image.yml
2323

@@ -29,7 +29,7 @@ batch:
2929
privileged-mode: true
3030
variables:
3131
ARCH: arm64v8
32-
VERSION: 3.10
32+
VERSION: *py-version
3333
buildspec: .cicd/buildspec_image.yml
3434

3535
- identifier: manifest
@@ -52,48 +52,48 @@ phases:
5252
- SUFFIX=${COMMIT_HASH:=$EPOCH}
5353
- if [ $USE_EPOCH -eq 1 ]; then SUFFIX=$EPOCH; fi
5454
- |
55-
if ! [ -z "${CODEBUILD_WEBHOOK_TRIGGER+x}" ]; then
56-
echo TRIGGER is $CODEBUILD_WEBHOOK_TRIGGER
57-
PRE=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 1`;
58-
echo PRE is $PRE
59-
echo SUFFIX is $SUFFIX
60-
if [ "${PRE}" == "tag" ]; then SUFFIX=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 2`; TAG_RELEASE=1 ; fi
61-
fi
55+
if ! [ -z "${CODEBUILD_WEBHOOK_TRIGGER+x}" ]; then
56+
echo TRIGGER is $CODEBUILD_WEBHOOK_TRIGGER
57+
PRE=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 1`;
58+
echo PRE is $PRE
59+
echo SUFFIX is $SUFFIX
60+
if [ "${PRE}" == "tag" ]; then SUFFIX=`echo $CODEBUILD_WEBHOOK_TRIGGER|cut -d '/' -f 2`; TAG_RELEASE=1 ; fi
61+
fi
6262
- echo SUFFIX ends up being $SUFFIX
6363
build:
6464
commands:
6565
- |
66-
for VERSION in py310; do
67-
for ARCH in "amd64" "arm64v8"; do
68-
TAG=${SUFFIX}-${VERSION}-${ARCH}
69-
echo TAG is $TAG
66+
for VERSION in py310; do
67+
for ARCH in "amd64" "arm64v8"; do
68+
TAG=${SUFFIX}-${VERSION}-${ARCH}
69+
echo TAG is $TAG
7070
71-
echo Publish from ${REGISTRY_URI}/{REPOSITORY_NAME}:${TAG} to ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${TAG}
72-
docker pull ${REGISTRY_URI}/${REPOSITORY_NAME}:${TAG}
73-
docker tag ${REGISTRY_URI}/${REPOSITORY_NAME}:${TAG} ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${TAG}
74-
docker push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${TAG}
75-
done
71+
echo Publish from ${REGISTRY_URI}/{REPOSITORY_NAME}:${TAG} to ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${TAG}
72+
docker pull ${REGISTRY_URI}/${REPOSITORY_NAME}:${TAG}
73+
docker tag ${REGISTRY_URI}/${REPOSITORY_NAME}:${TAG} ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${TAG}
74+
docker push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${TAG}
7675
done
76+
done
7777
7878
- docker manifest create ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}
79-
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-amd64
80-
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-arm64v8
79+
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-amd64
80+
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-arm64v8
8181
- docker manifest push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}
8282

8383
- |
84-
if ! [ $TAG_RELEASE -eq 1 ]; then
85-
docker manifest create ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:nightly \
86-
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-amd64 \
87-
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-arm64v8 ;
84+
if ! [ $TAG_RELEASE -eq 1 ]; then
85+
docker manifest create ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:nightly \
86+
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-amd64 \
87+
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-arm64v8 ;
8888
89-
docker manifest push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:nightly
90-
else
91-
docker manifest create ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:latest \
92-
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-amd64 \
93-
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-arm64v8 ;
89+
docker manifest push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:nightly
90+
else
91+
docker manifest create ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:latest \
92+
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-amd64 \
93+
--amend ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:${SUFFIX}-py310-arm64v8 ;
9494
95-
docker manifest push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:latest
96-
fi
95+
docker manifest push ${PUBLIC_REGISTRY}/${REPOSITORY_NAME}:latest
96+
fi
9797
9898
finally:
9999
- rm -rfv ~/.docker

0 commit comments

Comments
 (0)