From e21f90ab67b1823052fa0063bb08d5da4e2916a8 Mon Sep 17 00:00:00 2001 From: maskarb Date: Fri, 9 Jun 2023 11:13:23 -0400 Subject: [PATCH 1/5] upgrade to python 3.11 --- .github/workflows/ci.yml | 4 ++-- Dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c77ca68b2..4658103f6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4.3.0 with: - python-version: '3.9' + python-version: '3.11' - name: Run pre-commit checks uses: pre-commit/action@v3.0.0 @@ -147,7 +147,7 @@ jobs: max-parallel: 4 matrix: python-version: - - '3.9' + - '3.11' env: COMPOSE_FILE: .github/postgres/docker-compose.yaml diff --git a/Dockerfile b/Dockerfile index 14f3d3f598..0d5b013213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS base USER root -ENV PYTHON_VERSION=3.9 \ +ENV PYTHON_VERSION=3.11 \ PYTHONUNBUFFERED=1 \ PYTHONIOENCODING=UTF-8 \ LC_ALL=en_US.UTF-8 \ @@ -22,8 +22,8 @@ LABEL summary="$SUMMARY" \ io.k8s.description="$DESCRIPTION" \ io.k8s.display-name="Koku" \ io.openshift.expose-services="8000:http" \ - io.openshift.tags="builder,python,python39,rh-python39" \ - com.redhat.component="python39-docker" \ + io.openshift.tags="builder,python,python3.11,rh-python3.11" \ + com.redhat.component="python3.11-docker" \ name="Koku" \ version="1" \ maintainer="Red Hat Cost Management Services " @@ -33,7 +33,7 @@ LABEL summary="$SUMMARY" \ # gcc to compile some python packages (e.g. ciso8601) # shadow-utils to make useradd available # libpq-devel needed for building psycopg2 -RUN INSTALL_PKGS="python39 python39-devel glibc-langpack-en gcc shadow-utils libpq-devel" && \ +RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc shadow-utils libpq-devel" && \ microdnf --nodocs -y upgrade && \ microdnf reinstall tzdata && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ @@ -72,7 +72,7 @@ ARG USER_ID=1000 # Create a Python virtual environment for use by any application to avoid # potential conflicts with Python packages preinstalled in the main Python # installation. -RUN python3.9 -m venv /pipenv-venv \ +RUN python3.11 -m venv /pipenv-venv \ && /pipenv-venv/bin/python -m pip install --upgrade pip setuptools \ && /pipenv-venv/bin/python -m pip install pipenv From 6cae27da393408ebea5b4785d3715f30e83c6537 Mon Sep 17 00:00:00 2001 From: maskarb Date: Fri, 9 Jun 2023 11:56:47 -0400 Subject: [PATCH 2/5] pipfile update --- Makefile | 1 + Pipfile | 2 +- Pipfile.lock | 440 +++++++++++++++++++-------------------- README.md | 2 +- sonar-project.properties | 2 +- 5 files changed, 217 insertions(+), 230 deletions(-) diff --git a/Makefile b/Makefile index 625a06261e..e19a420a5c 100644 --- a/Makefile +++ b/Makefile @@ -169,6 +169,7 @@ clear-trino: clear-trino-data: $(PREFIX) rm -fr ./.trino/parquet_data/koku-bucket/data + $(PREFIX) rm -fr ./.trino/parquet_data/koku-bucket/hcs clear-cache: $(DOCKER) exec -it koku_redis redis-cli -n 1 flushall diff --git a/Pipfile b/Pipfile index 1824c7e5f9..81bc08d64e 100644 --- a/Pipfile +++ b/Pipfile @@ -82,4 +82,4 @@ tox = ">=3.0" watchdog = ">=2.1.1" [requires] -python_version = "3.9" +python_version = "3.11" diff --git a/Pipfile.lock b/Pipfile.lock index 81864cfafc..6265a237e4 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "613abf618b3ab1b566c2a95bec4e1b97fc3bee85fb3a5b28855da3b79e1cb9cf" + "sha256": "2b55619e8ebd33442d7456d0c78b317794f843fbe5d241b2274d9835cfd9ec56" }, "pipfile-spec": 6, "requires": { - "python_version": "3.9" + "python_version": "3.11" }, "sources": [ { @@ -57,19 +57,11 @@ }, "asgiref": { "hashes": [ - "sha256:33958cb2e4b3cd8b1b06ef295bd8605cde65b11df51d3beab39e2e149a610ab3", - "sha256:8de379fcc383bcfe4507e229fc31209ea23d4831c850f74063b2c11639474dd2" + "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e", + "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed" ], "markers": "python_version >= '3.7'", - "version": "==3.7.1" - }, - "async-timeout": { - "hashes": [ - "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15", - "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" - ], - "markers": "python_full_version <= '3.11.2'", - "version": "==4.0.2" + "version": "==3.7.2" }, "azure-common": { "hashes": [ @@ -80,11 +72,11 @@ }, "azure-core": { "hashes": [ - "sha256:075fe06b74c3007950dd93d49440c2f3430fd9b4a5a2756ec8c79454afc989c6", - "sha256:d9664b4bc2675d72fba461a285ac43ae33abb2967014a955bf136d9703a2ab3c" + "sha256:068ea8b61888165b1e749892785936e293e35070a10ea10c8c11ec9f5186a2f8", + "sha256:8ec1b607d11ab0dc762606c4804b52b6b2fae83524e89ed575055046b69f1afe" ], "markers": "python_version >= '3.7'", - "version": "==1.26.4" + "version": "==1.27.0" }, "azure-identity": { "hashes": [ @@ -144,26 +136,27 @@ }, "billiard": { "hashes": [ - "sha256:299de5a8da28a783d51b197d496bef4f1595dd023a93a4f59dde1886ae905547", - "sha256:87103ea78fa6ab4d5c751c4909bcff74617d985de7fa8b672cf8618afd5a875b" + "sha256:0f50d6be051c6b2b75bfbc8bfd85af195c5739c281d3f5b86a5640c65563614a", + "sha256:1ad2eeae8e28053d729ba3373d34d9d6e210f6e4d8bf0a9c64f92bd053f1edf5" ], - "version": "==3.6.4.0" + "markers": "python_version >= '3.7'", + "version": "==4.1.0" }, "boto3": { "hashes": [ - "sha256:152def2fcc9854dcc42383d2b53e2ed2c9ccb5ff6cc0f3ada20f1ab54418ede4", - "sha256:a5d6fdcaec863bc7ad2f8133ff9a926d6f06468b83b5fb631cd90bd33b709c45" + "sha256:0ab83f1b8f997527a513152bc64fd1873536b1d92bdc98cb40f927aca6af6325", + "sha256:be4e27d48744651fbd0898a6b51faaddd71936651167ba3c2e19855083ce137e" ], "index": "pypi", - "version": "==1.26.141" + "version": "==1.26.150" }, "botocore": { "hashes": [ - "sha256:b01d156c42765f3f437959e01a8c7f3cb0e29b24aa0b8f373498133408b2e3c7", - "sha256:e86e1633f98838317b9e1b5c874c4d85339b77f6b7e55c2a4d83913f6166f9ad" + "sha256:0e8c8f0dab008418e4e136ecf2a450fa01bae5b725b7b43ff7cc13beebbf33aa", + "sha256:9af58faa67c99d860eabba4cd030b5ee5f4e7e1c301edd6a9174419f75b39334" ], "markers": "python_version >= '3.7'", - "version": "==1.29.141" + "version": "==1.29.150" }, "bs4": { "hashes": [ @@ -174,19 +167,19 @@ }, "cachetools": { "hashes": [ - "sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14", - "sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4" + "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590", + "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b" ], "index": "pypi", - "version": "==5.3.0" + "version": "==5.3.1" }, "celery": { "hashes": [ - "sha256:138420c020cd58d6707e6257b6beda91fd39af7afde5d36c6334d175302c0e14", - "sha256:fafbd82934d30f8a004f81e8f7a062e31413a23d444be8ee3326553915958c6d" + "sha256:1eaba5ee14d8c8c0bed8f6063e5e10dabdbcf23503a861cf0e10b7221d99cb0d", + "sha256:95d29f9a93f41c4b122fddf1fe3ef13f872029dca4ad1f9af4f1a414442ceecf" ], "index": "pypi", - "version": "==5.2.7" + "version": "==5.3.0" }, "certifi": { "hashes": [ @@ -531,11 +524,11 @@ }, "django-extensions": { "hashes": [ - "sha256:2a4f4d757be2563cd1ff7cfdf2e57468f5f931cc88b23cf82ca75717aae504a4", - "sha256:421464be390289513f86cb5e18eb43e5dc1de8b4c27ba9faa3b91261b0d67e09" + "sha256:44d27919d04e23b3f40231c4ab7af4e61ce832ef46d610cc650d53e68328410a", + "sha256:9600b7562f79a92cbf1fde6403c04fee314608fefbb595502e34383ae8203401" ], "index": "pypi", - "version": "==3.2.1" + "version": "==3.2.3" }, "django-filter": { "hashes": [ @@ -601,19 +594,19 @@ }, "google-api-python-client": { "hashes": [ - "sha256:29b52232b159be72a79890b6d9f703cf6d8ebbec0ef6371c5670c1abeca5a9f9", - "sha256:bbea5869877c822d12d318943833d988497b3a18b9ca2386967118074db676f3" + "sha256:37068453f79ea28e5394a8fe20a4ba620594e7f8541068bea2e844dacdcc9d33", + "sha256:d003008400a779524ea21b5a3ddc6fc59327d401fb8c37c466d413694c279cae" ], "index": "pypi", - "version": "==2.87.0" + "version": "==2.88.0" }, "google-auth": { "hashes": [ - "sha256:be617bfaf77774008e9d177573f782e109188c8a64ae6e744285df5cea3e7df6", - "sha256:f39d528077ac540793dd3c22a8706178f157642a67d874db25c640b7fead277e" + "sha256:a9cfa88b3e16196845e64a3658eb953992129d13ac7337b064c6546f77c17183", + "sha256:ea165e014c7cbd496558796b627c271aa8c18b4cba79dc1cc962b24c5efdfb85" ], "index": "pypi", - "version": "==2.19.0" + "version": "==2.19.1" }, "google-auth-httplib2": { "hashes": [ @@ -624,11 +617,11 @@ }, "google-cloud-bigquery": { "hashes": [ - "sha256:4b02def076e2db8cec66f65fb627d13904a9fc3cf4fee315ede43dcb7038a8df", - "sha256:848a3cbce0ba7d4f1e9551400a7c99aa0eab72290d5a1bbbe69f18a24a10bd3a" + "sha256:3a1c1b3566f9f27ea83a36aaf54eb879444ee73ef42456764018a0b3b556d0fb", + "sha256:f568c36dfc9b8a2cf7e8ac10dd0889e0a52e8edf3dd556f3dd1eb441eda14364" ], "index": "pypi", - "version": "==3.10.0" + "version": "==3.11.0" }, "google-cloud-core": { "hashes": [ @@ -812,17 +805,17 @@ }, "ibm-cloud-sdk-core": { "hashes": [ - "sha256:945a5a32d7958fc4c1a5c2b5ccb57de53c06df36373d91bb414cd8d3f2d217f7" + "sha256:a985f147e8d78cc7eaaf127ada3e5da37dc46e37dea184aaf8878caced781674" ], "index": "pypi", - "version": "==3.16.6" + "version": "==3.16.7" }, "ibm-platform-services": { "hashes": [ - "sha256:a776078bd0b56d9cf09f1e5de2c1694166c1ab99e9725f86cc171b938ce251d9" + "sha256:291a48370cde2d498e6fc2a5bdfbad9f2e2241a92b800bc18f9e96c4b2fc42f7" ], "index": "pypi", - "version": "==0.34.2" + "version": "==0.37.0" }, "idna": { "hashes": [ @@ -873,11 +866,11 @@ }, "kombu": { "hashes": [ - "sha256:37cee3ee725f94ea8bb173eaab7c1760203ea53bbebae226328600f9d2799610", - "sha256:8b213b24293d3417bcf0d2f5537b7f756079e3ea232a8386dcc89a59fd2361a4" + "sha256:d084ec1f96f7a7c37ba9e816823bdbc08f0fc7ddb3a5be555805e692102297d8", + "sha256:fa9be55281bb351ba9da582b2a74e3dd5015b8d075b287e4d16f0b2f25fefcc2" ], - "markers": "python_version >= '3.7'", - "version": "==5.2.4" + "markers": "python_version >= '3.8'", + "version": "==5.3.0" }, "markupsafe": { "hashes": [ @@ -1098,11 +1091,11 @@ }, "oci": { "hashes": [ - "sha256:24d7ad7d1e29c96a44ee5856db42b8c0b73a4a428c887f794f94b79a412f5e30", - "sha256:fbd91ba9fdfcc0c0cd989e981ea151cacf883c45e3951b38c677b2cb43dca7e5" + "sha256:05ab759dd93a709d8247bf350360411db4e11c79cdda825cb893dc3cefb65da6", + "sha256:c84c69623f652451e81c65485193b54abad3a962d5987eb24c82e239794d3107" ], "index": "pypi", - "version": "==2.103.0" + "version": "==2.104.1" }, "packaging": { "hashes": [ @@ -1184,22 +1177,22 @@ }, "protobuf": { "hashes": [ - "sha256:2036a3a1e7fc27f973fa0a7888dce712393af644f4695385f117886abc792e39", - "sha256:32e78beda26d7a101fecf15d7a4a792278a0d26a31bc327ff05564a9d68ab8ee", - "sha256:346990f634272caac1f09efbcfbbacb23098b1f606d172534c6fa2d9758bb436", - "sha256:3b8905eafe4439076e1f58e9d1fa327025fd2777cf90f14083092ae47f77b0aa", - "sha256:3ce113b3f3362493bddc9069c2163a38f240a9ed685ff83e7bcb756b05e1deb0", - "sha256:410bcc0a5b279f634d3e16082ce221dfef7c3392fac723500e2e64d1806dd2be", - "sha256:5b9cd6097e6acae48a68cb29b56bc79339be84eca65b486910bb1e7a30e2b7c1", - "sha256:65f0ac96ef67d7dd09b19a46aad81a851b6f85f89725577f16de38f2d68ad477", - "sha256:91fac0753c3c4951fbb98a93271c43cc7cf3b93cf67747b3e600bb1e5cc14d61", - "sha256:95789b569418a3e32a53f43d7763be3d490a831e9c08042539462b6d972c2d7e", - "sha256:ac50be82491369a9ec3710565777e4da87c6d2e20404e0abb1f3a8f10ffd20f0", - "sha256:decf119d54e820f298ee6d89c72d6b289ea240c32c521f00433f9dc420595f38", - "sha256:f9510cac91e764e86acd74e2b7f7bc5e6127a7f3fb646d7c8033cfb84fd1176a" + "sha256:09310bce43353b46d73ba7e3bca78273b9bc50349509b9698e64d288c6372c2a", + "sha256:20874e7ca4436f683b64ebdbee2129a5a2c301579a67d1a7dda2cdf62fb7f5f7", + "sha256:25e3370eda26469b58b602e29dff069cfaae8eaa0ef4550039cc5ef8dc004511", + "sha256:281342ea5eb631c86697e1e048cb7e73b8a4e85f3299a128c116f05f5c668f8f", + "sha256:384dd44cb4c43f2ccddd3645389a23ae61aeb8cfa15ca3a0f60e7c3ea09b28b3", + "sha256:54a533b971288af3b9926e53850c7eb186886c0c84e61daa8444385a4720297f", + "sha256:6c081863c379bb1741be8f8193e893511312b1d7329b4a75445d1ea9955be69e", + "sha256:86df87016d290143c7ce3be3ad52d055714ebaebb57cc659c387e76cfacd81aa", + "sha256:8da6070310d634c99c0db7df48f10da495cc283fd9e9234877f0cd182d43ab7f", + "sha256:b2cfab63a230b39ae603834718db74ac11e52bccaaf19bf20f5cce1a84cf76df", + "sha256:c52cfcbfba8eb791255edd675c1fe6056f723bf832fa67f0442218f8817c076e", + "sha256:ce744938406de1e64b91410f473736e815f28c3b71201302612a68bf01517fea", + "sha256:efabbbbac1ab519a514579ba9ec52f006c28ae19d97915951f69fa70da2c9e91" ], "markers": "python_version >= '3.7'", - "version": "==4.23.1" + "version": "==4.23.2" }, "psutil": { "hashes": [ @@ -1304,18 +1297,18 @@ }, "pyopenssl": { "hashes": [ - "sha256:841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7", - "sha256:9e0c526404a210df9d2b18cd33364beadb0dc858a739b885677bc65e105d4a4c" + "sha256:24f0dc5227396b3e831f4c7f602b950a5e9833d292c8e4a2e06b709292806ae2", + "sha256:276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac" ], "markers": "python_version >= '3.6'", - "version": "==23.1.1" + "version": "==23.2.0" }, "pyparsing": { "hashes": [ "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb", "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc" ], - "markers": "python_version >= '3.1'", + "markers": "python_version > '3.0'", "version": "==3.0.9" }, "python-dateutil": { @@ -1410,11 +1403,11 @@ }, "sentry-sdk": { "hashes": [ - "sha256:0bbcecda9f51936904c1030e7fef0fe693e633888f02a14d1cb68646a50e83b3", - "sha256:56d6d9d194c898d853a7c1dd99bed92ce82334ee1282292c15bcc967ff1a49b5" + "sha256:79afb7c896014038e358401ad1d36889f97a129dfa8031c49b3f238cd1aa3935", + "sha256:aa796423eb6a2f4a8cd7a5b02ba6558cb10aab4ccdc0537f63a47b038c520c38" ], "index": "pypi", - "version": "==1.24.0" + "version": "==1.25.1" }, "setuptools": { "hashes": [ @@ -1429,7 +1422,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "soupsieve": { @@ -1477,19 +1470,27 @@ }, "trino": { "hashes": [ - "sha256:3c95747f70231718e203a92487269f95287ce60225d79437cbb15c49930a3746", - "sha256:df56f1454076f9a4c902f90d5ba40bf32dfc3e2609f010450be58f18777a3994" + "sha256:3a9f1e48a302368560b4ad3f13d8145912802c59a3b26dea80edda5460843cd5", + "sha256:e12992811aef54645e589c671a722952ab00ac0160e8207ecb987254a1fe3d65" ], "index": "pypi", - "version": "==0.325.0" + "version": "==0.326.0" }, "typing-extensions": { "hashes": [ - "sha256:06006244c70ac8ee83fa8282cb188f697b8db25bc8b4df07be1873c43897060c", - "sha256:3a8b36f13dd5fdc5d1b16fe317f5668545de77fa0b8e02006381fd49d731ab98" + "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26", + "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5" ], "markers": "python_version >= '3.7'", - "version": "==4.6.2" + "version": "==4.6.3" + }, + "tzdata": { + "hashes": [ + "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a", + "sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda" + ], + "markers": "python_version >= '2'", + "version": "==2023.3" }, "tzlocal": { "hashes": [ @@ -1587,11 +1588,11 @@ }, "asgiref": { "hashes": [ - "sha256:33958cb2e4b3cd8b1b06ef295bd8605cde65b11df51d3beab39e2e149a610ab3", - "sha256:8de379fcc383bcfe4507e229fc31209ea23d4831c850f74063b2c11639474dd2" + "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e", + "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed" ], "markers": "python_version >= '3.7'", - "version": "==3.7.1" + "version": "==3.7.2" }, "astroid": { "hashes": [ @@ -1603,11 +1604,11 @@ }, "azure-core": { "hashes": [ - "sha256:075fe06b74c3007950dd93d49440c2f3430fd9b4a5a2756ec8c79454afc989c6", - "sha256:d9664b4bc2675d72fba461a285ac43ae33abb2967014a955bf136d9703a2ab3c" + "sha256:068ea8b61888165b1e749892785936e293e35070a10ea10c8c11ec9f5186a2f8", + "sha256:8ec1b607d11ab0dc762606c4804b52b6b2fae83524e89ed575055046b69f1afe" ], "markers": "python_version >= '3.7'", - "version": "==1.26.4" + "version": "==1.27.0" }, "azure-storage-blob": { "hashes": [ @@ -1619,19 +1620,19 @@ }, "boto3": { "hashes": [ - "sha256:152def2fcc9854dcc42383d2b53e2ed2c9ccb5ff6cc0f3ada20f1ab54418ede4", - "sha256:a5d6fdcaec863bc7ad2f8133ff9a926d6f06468b83b5fb631cd90bd33b709c45" + "sha256:0ab83f1b8f997527a513152bc64fd1873536b1d92bdc98cb40f927aca6af6325", + "sha256:be4e27d48744651fbd0898a6b51faaddd71936651167ba3c2e19855083ce137e" ], "index": "pypi", - "version": "==1.26.141" + "version": "==1.26.150" }, "botocore": { "hashes": [ - "sha256:b01d156c42765f3f437959e01a8c7f3cb0e29b24aa0b8f373498133408b2e3c7", - "sha256:e86e1633f98838317b9e1b5c874c4d85339b77f6b7e55c2a4d83913f6166f9ad" + "sha256:0e8c8f0dab008418e4e136ecf2a450fa01bae5b725b7b43ff7cc13beebbf33aa", + "sha256:9af58faa67c99d860eabba4cd030b5ee5f4e7e1c301edd6a9174419f75b39334" ], "markers": "python_version >= '3.7'", - "version": "==1.29.141" + "version": "==1.29.150" }, "cached-property": { "hashes": [ @@ -1642,11 +1643,11 @@ }, "cachetools": { "hashes": [ - "sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14", - "sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4" + "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590", + "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b" ], "index": "pypi", - "version": "==5.3.0" + "version": "==5.3.1" }, "certifi": { "hashes": [ @@ -1898,68 +1899,77 @@ }, "coverage": { "hashes": [ - "sha256:004948e296149644d208964300cb3d98affc5211e9e490e9979af4030b0d6473", - "sha256:13cde6bb0e58fb67d09e2f373de3899d1d1e866c5a9ff05d93615f2f54fbd2bb", - "sha256:1c9e4a5eb1bbc3675ee57bc31f8eea4cd7fb0cbcbe4912cf1cb2bf3b754f4a80", - "sha256:2025f913f2edb0272ef15d00b1f335ff8908c921c8eb2013536fcaf61f5a683d", - "sha256:25bad4196104761bc26b1dae9b57383826542ec689ff0042f7f4f4dd7a815cba", - "sha256:2692306d3d4cb32d2cceed1e47cebd6b1d2565c993d6d2eda8e6e6adf53301e6", - "sha256:272ab31228a9df857ab5df5d67936d8861464dc89c5d3fab35132626e9369379", - "sha256:2e8c0e79820cdd67978e1120983786422d279e07a381dbf89d03bbb23ec670a6", - "sha256:3062fd5c62df988cea9f2972c593f77fed1182bfddc5a3b12b1e606cb7aba99e", - "sha256:3436927d1794fa6763b89b60c896f9e3bd53212001026ebc9080d23f0c2733c1", - "sha256:35db06450272473eab4449e9c2ad9bc6a0a68dab8e81a0eae6b50d9c2838767e", - "sha256:392154d09bd4473b9d11351ab5d63391f3d5d24d752f27b3be7498b0ee2b5226", - "sha256:3cff6980fe7100242170092bb40d2b1cdad79502cd532fd26b12a2b8a5f9aee0", - "sha256:42c692b55a647a832025a4c048007034fe77b162b566ad537ce65ad824b12a84", - "sha256:44c9b9f1a245f3d0d202b1a8fa666a80b5ecbe4ad5d0859c0fb16a52d9763224", - "sha256:496b86f1fc9c81a1cd53d8842ef712e950a4611bba0c42d33366a7b91ba969ec", - "sha256:4bbd58eb5a2371bf160590f4262109f66b6043b0b991930693134cb617bc0169", - "sha256:4e3783a286d5a93a2921396d50ce45a909aa8f13eee964465012f110f0cbb611", - "sha256:4f3c7c19581d471af0e9cb49d928172cd8492cd78a2b7a4e82345d33662929bb", - "sha256:52c139b7ab3f0b15f9aad0a3fedef5a1f8c0b2bdc291d88639ca2c97d3682416", - "sha256:541280dde49ce74a4262c5e395b48ea1207e78454788887118c421cb4ffbfcac", - "sha256:5906f6a84b47f995cd1bf0aca1c72d591c55ee955f98074e93660d64dfc66eb9", - "sha256:6284a2005e4f8061c58c814b1600ad0074ccb0289fe61ea709655c5969877b70", - "sha256:6727a0d929ff0028b1ed8b3e7f8701670b1d7032f219110b55476bb60c390bfb", - "sha256:697f4742aa3f26c107ddcb2b1784a74fe40180014edbd9adaa574eac0529914c", - "sha256:6b9f64526286255735847aed0221b189486e0b9ed943446936e41b7e44b08783", - "sha256:6babcbf1e66e46052442f10833cfc4a0d3554d8276aa37af8531a83ed3c1a01d", - "sha256:6e7f1a8328eeec34c54f1d5968a708b50fc38d31e62ca8b0560e84a968fbf9a9", - "sha256:71f739f97f5f80627f1fee2331e63261355fd1e9a9cce0016394b6707ac3f4ec", - "sha256:76d06b721c2550c01a60e5d3093f417168658fb454e5dfd9a23570e9bffe39a1", - "sha256:77a04b84d01f0e12c66f16e69e92616442dc675bbe51b90bfb074b1e5d1c7fbd", - "sha256:97729e6828643f168a2a3f07848e1b1b94a366b13a9f5aba5484c2215724edc8", - "sha256:9a8723ccec4e564d4b9a79923246f7b9a8de4ec55fa03ec4ec804459dade3c4f", - "sha256:a5ffd45c6b93c23a8507e2f436983015c6457aa832496b6a095505ca2f63e8f1", - "sha256:a6f03f87fea579d55e0b690d28f5042ec1368650466520fbc400e7aeaf09e995", - "sha256:aac1d5fdc5378f6bac2c0c7ebe7635a6809f5b4376f6cf5d43243c1917a67087", - "sha256:ae82c5f168d2a39a5d69a12a69d4dc23837a43cf2ca99be60dfe59996ea6b113", - "sha256:bc7b667f8654376e9353dd93e55e12ce2a59fb6d8e29fce40de682273425e044", - "sha256:c1d7a31603c3483ac49c1726723b0934f88f2c011c660e6471e7bd735c2fa110", - "sha256:c534431153caffc7c495c3eddf7e6a6033e7f81d78385b4e41611b51e8870446", - "sha256:c93d52c3dc7b9c65e39473704988602300e3cc1bad08b5ab5b03ca98bbbc68c1", - "sha256:cbcc874f454ee51f158afd604a315f30c0e31dff1d5d5bf499fc529229d964dd", - "sha256:d3cacc6a665221108ecdf90517a8028d07a2783df3417d12dcfef1c517e67478", - "sha256:d712cefff15c712329113b01088ba71bbcef0f7ea58478ca0bbec63a824844cb", - "sha256:d7786b2fa7809bf835f830779ad285215a04da76293164bb6745796873f0942d", - "sha256:dc11b42fa61ff1e788dd095726a0aed6aad9c03d5c5984b54cb9e1e67b276aa5", - "sha256:dc4d5187ef4d53e0d4c8eaf530233685667844c5fb0b855fea71ae659017854b", - "sha256:f5440cdaf3099e7ab17a5a7065aed59aff8c8b079597b61c1f8be6f32fe60636", - "sha256:fa079995432037b5e2ef5ddbb270bcd2ded9f52b8e191a5de11fe59a00ea30d8", - "sha256:fbe6e8c0a9a7193ba10ee52977d4d5e7652957c1f56ccefed0701db8801a2a3b", - "sha256:fde5c7a9d9864d3e07992f66767a9817f24324f354caa3d8129735a3dc74f126" - ], - "index": "pypi", - "version": "==7.2.6" + "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f", + "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2", + "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a", + "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a", + "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01", + "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6", + "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7", + "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f", + "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02", + "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c", + "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063", + "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a", + "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5", + "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959", + "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97", + "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6", + "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f", + "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9", + "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5", + "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f", + "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562", + "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe", + "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9", + "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f", + "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb", + "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb", + "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1", + "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb", + "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250", + "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e", + "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511", + "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5", + "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59", + "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2", + "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d", + "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3", + "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4", + "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de", + "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9", + "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833", + "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0", + "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9", + "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d", + "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050", + "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d", + "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6", + "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353", + "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb", + "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e", + "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8", + "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495", + "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2", + "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd", + "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27", + "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1", + "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818", + "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4", + "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e", + "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850", + "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3" + ], + "index": "pypi", + "version": "==7.2.7" }, "crc-bonfire": { "hashes": [ - "sha256:1afd326f2758211e9034c2c8b310649df56619fffa44c4e3de79a65f9d92e6b1", - "sha256:6d36cc127e4f88802d7506a5a09ca956e8dc099e4d5f8159a9fe2eb64a6a61f5" + "sha256:941594c18f9b96d6352078d6751c0ed7d816253b77ad64ede881ae8286b6b653", + "sha256:e2c43f2669c614771723efc6154d100382c2c00e05236a842eb208b89761ef5d" ], "index": "pypi", - "version": "==4.15.0" + "version": "==4.16.0" }, "cryptography": { "hashes": [ @@ -2046,11 +2056,11 @@ }, "faker": { "hashes": [ - "sha256:80a5ea1464556c06b98bf47ea3adc7f33811a1182518d847860b1874080bd3c9", - "sha256:defe9ed618a67ebf0f3eb1895e198c2355a7128a09087a6dce342ef2253263ea" + "sha256:633b278caa3ec239463f9139c74da2607c8da5710e56d5d7d30fc8a7440104c4", + "sha256:d9f363720c4a6cf9884c6c3e26e2ce26266ffe5d741a9bc7cb9256779bc62190" ], "index": "pypi", - "version": "==18.9.0" + "version": "==18.10.1" }, "filelock": { "hashes": [ @@ -2080,7 +2090,7 @@ "hashes": [ "sha256:34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", "version": "==0.18.3" }, "google-api-core": { @@ -2093,19 +2103,19 @@ }, "google-auth": { "hashes": [ - "sha256:be617bfaf77774008e9d177573f782e109188c8a64ae6e744285df5cea3e7df6", - "sha256:f39d528077ac540793dd3c22a8706178f157642a67d874db25c640b7fead277e" + "sha256:a9cfa88b3e16196845e64a3658eb953992129d13ac7337b064c6546f77c17183", + "sha256:ea165e014c7cbd496558796b627c271aa8c18b4cba79dc1cc962b24c5efdfb85" ], "index": "pypi", - "version": "==2.19.0" + "version": "==2.19.1" }, "google-cloud-bigquery": { "hashes": [ - "sha256:4b02def076e2db8cec66f65fb627d13904a9fc3cf4fee315ede43dcb7038a8df", - "sha256:848a3cbce0ba7d4f1e9551400a7c99aa0eab72290d5a1bbbe69f18a24a10bd3a" + "sha256:3a1c1b3566f9f27ea83a36aaf54eb879444ee73ef42456764018a0b3b556d0fb", + "sha256:f568c36dfc9b8a2cf7e8ac10dd0889e0a52e8edf3dd556f3dd1eb441eda14364" ], "index": "pypi", - "version": "==3.10.0" + "version": "==3.11.0" }, "google-cloud-core": { "hashes": [ @@ -2301,14 +2311,6 @@ "markers": "python_version >= '3.5'", "version": "==3.4" }, - "importlib-resources": { - "hashes": [ - "sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6", - "sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a" - ], - "markers": "python_version < '3.10'", - "version": "==5.12.0" - }, "isodate": { "hashes": [ "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96", @@ -2415,11 +2417,11 @@ }, "koku-nise": { "hashes": [ - "sha256:54f826b0b69f1e0d0e0054e4d4565fbe903ff0a9f3202e26825b23f75aaa933f", - "sha256:c7ad2915d8f05bd1b0e3ca18e0941dd4e894cd850e01bc97c8753875a929d6d4" + "sha256:11dc167de5c70e7827023fa22165e0b561b4a28440b3c54555ca3a5d2dcd6a47", + "sha256:7dddef8fb231af2ac6b6a0a56556e9e605c16dfcf7533f7eb38e2afa11a81d50" ], "index": "pypi", - "version": "==4.2.8" + "version": "==4.3.0" }, "kubernetes": { "hashes": [ @@ -2603,11 +2605,11 @@ }, "model-bakery": { "hashes": [ - "sha256:d38a72502979be20c9c5c2b1682faefde9da4eae935c028cc35832d484ea1039", - "sha256:d516d93315f66fc7f2cef0a85e1ca9e1ebb656cca5e383f17127f023b4bbdb8c" + "sha256:70e991dd503e3f1956632c621946bb8e71012172db740bab75cd9d2a447283a3", + "sha256:bfa5d118f91f08ef4694d4aaab168c98efc91dab086aee587e71d66a7001701a" ], "index": "pypi", - "version": "==1.11.0" + "version": "==1.12.0" }, "multidict": { "hashes": [ @@ -2742,11 +2744,11 @@ }, "oci": { "hashes": [ - "sha256:24d7ad7d1e29c96a44ee5856db42b8c0b73a4a428c887f794f94b79a412f5e30", - "sha256:fbd91ba9fdfcc0c0cd989e981ea151cacf883c45e3951b38c677b2cb43dca7e5" + "sha256:05ab759dd93a709d8247bf350360411db4e11c79cdda825cb893dc3cefb65da6", + "sha256:c84c69623f652451e81c65485193b54abad3a962d5987eb24c82e239794d3107" ], "index": "pypi", - "version": "==2.103.0" + "version": "==2.104.1" }, "ocviapy": { "hashes": [ @@ -2877,22 +2879,22 @@ }, "protobuf": { "hashes": [ - "sha256:2036a3a1e7fc27f973fa0a7888dce712393af644f4695385f117886abc792e39", - "sha256:32e78beda26d7a101fecf15d7a4a792278a0d26a31bc327ff05564a9d68ab8ee", - "sha256:346990f634272caac1f09efbcfbbacb23098b1f606d172534c6fa2d9758bb436", - "sha256:3b8905eafe4439076e1f58e9d1fa327025fd2777cf90f14083092ae47f77b0aa", - "sha256:3ce113b3f3362493bddc9069c2163a38f240a9ed685ff83e7bcb756b05e1deb0", - "sha256:410bcc0a5b279f634d3e16082ce221dfef7c3392fac723500e2e64d1806dd2be", - "sha256:5b9cd6097e6acae48a68cb29b56bc79339be84eca65b486910bb1e7a30e2b7c1", - "sha256:65f0ac96ef67d7dd09b19a46aad81a851b6f85f89725577f16de38f2d68ad477", - "sha256:91fac0753c3c4951fbb98a93271c43cc7cf3b93cf67747b3e600bb1e5cc14d61", - "sha256:95789b569418a3e32a53f43d7763be3d490a831e9c08042539462b6d972c2d7e", - "sha256:ac50be82491369a9ec3710565777e4da87c6d2e20404e0abb1f3a8f10ffd20f0", - "sha256:decf119d54e820f298ee6d89c72d6b289ea240c32c521f00433f9dc420595f38", - "sha256:f9510cac91e764e86acd74e2b7f7bc5e6127a7f3fb646d7c8033cfb84fd1176a" + "sha256:09310bce43353b46d73ba7e3bca78273b9bc50349509b9698e64d288c6372c2a", + "sha256:20874e7ca4436f683b64ebdbee2129a5a2c301579a67d1a7dda2cdf62fb7f5f7", + "sha256:25e3370eda26469b58b602e29dff069cfaae8eaa0ef4550039cc5ef8dc004511", + "sha256:281342ea5eb631c86697e1e048cb7e73b8a4e85f3299a128c116f05f5c668f8f", + "sha256:384dd44cb4c43f2ccddd3645389a23ae61aeb8cfa15ca3a0f60e7c3ea09b28b3", + "sha256:54a533b971288af3b9926e53850c7eb186886c0c84e61daa8444385a4720297f", + "sha256:6c081863c379bb1741be8f8193e893511312b1d7329b4a75445d1ea9955be69e", + "sha256:86df87016d290143c7ce3be3ad52d055714ebaebb57cc659c387e76cfacd81aa", + "sha256:8da6070310d634c99c0db7df48f10da495cc283fd9e9234877f0cd182d43ab7f", + "sha256:b2cfab63a230b39ae603834718db74ac11e52bccaaf19bf20f5cce1a84cf76df", + "sha256:c52cfcbfba8eb791255edd675c1fe6056f723bf832fa67f0442218f8817c076e", + "sha256:ce744938406de1e64b91410f473736e815f28c3b71201302612a68bf01517fea", + "sha256:efabbbbac1ab519a514579ba9ec52f006c28ae19d97915951f69fa70da2c9e91" ], "markers": "python_version >= '3.7'", - "version": "==4.23.1" + "version": "==4.23.2" }, "py": { "hashes": [ @@ -2951,18 +2953,18 @@ }, "pyopenssl": { "hashes": [ - "sha256:841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7", - "sha256:9e0c526404a210df9d2b18cd33364beadb0dc858a739b885677bc65e105d4a4c" + "sha256:24f0dc5227396b3e831f4c7f602b950a5e9833d292c8e4a2e06b709292806ae2", + "sha256:276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac" ], "markers": "python_version >= '3.6'", - "version": "==23.1.1" + "version": "==23.2.0" }, "pyparsing": { "hashes": [ "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb", "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc" ], - "markers": "python_version >= '3.1'", + "markers": "python_version > '3.0'", "version": "==3.0.9" }, "python-dateutil": { @@ -3044,11 +3046,11 @@ }, "requests-mock": { "hashes": [ - "sha256:2fdbb637ad17ee15c06f33d31169e71bf9fe2bdb7bc9da26185be0dd8d842699", - "sha256:59c9c32419a9fb1ae83ec242d98e889c45bd7d7a65d48375cc243ec08441658b" + "sha256:ef10b572b489a5f28e09b708697208c4a3b2b89ef80a9f01584340ea357ec3c4", + "sha256:f7fae383f228633f6bececebdab236c478ace2284d6292c6e7e2867b9ab74d15" ], "index": "pypi", - "version": "==1.10.0" + "version": "==1.11.0" }, "requests-oauthlib": { "hashes": [ @@ -3095,7 +3097,7 @@ "sha256:14265a4cd1622429edcf300292ec98193530fb143fe642b3437024eca9bee8c5", "sha256:a18920f0839991bc9dfddb6dcc006c360b1064ba96257359f0ea356e9fa75a60" ], - "markers": "python_version < '4.0' and python_full_version >= '3.8.1'", + "markers": "python_full_version >= '3.8.1' and python_version < '4.0'", "version": "==2.0.4" }, "six": { @@ -3103,7 +3105,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", "version": "==1.16.0" }, "snakeviz": { @@ -3145,14 +3147,6 @@ "index": "pypi", "version": "==1.7.0" }, - "tomli": { - "hashes": [ - "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" - ], - "markers": "python_version < '3.11' and python_version >= '3.7'", - "version": "==2.0.1" - }, "tornado": { "hashes": [ "sha256:05615096845cf50a895026f749195bf0b10b8909f9be672f50b0fe69cba368e4", @@ -3187,11 +3181,11 @@ }, "typing-extensions": { "hashes": [ - "sha256:06006244c70ac8ee83fa8282cb188f697b8db25bc8b4df07be1873c43897060c", - "sha256:3a8b36f13dd5fdc5d1b16fe317f5668545de77fa0b8e02006381fd49d731ab98" + "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26", + "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5" ], "markers": "python_version >= '3.7'", - "version": "==4.6.2" + "version": "==4.6.3" }, "urllib3": { "hashes": [ @@ -3252,11 +3246,11 @@ }, "websocket-client": { "hashes": [ - "sha256:c7d67c13b928645f259d9b847ab5b57fd2d127213ca41ebd880de1f553b7c23b", - "sha256:f8c64e28cd700e7ba1f04350d66422b6833b82a796b525a51e740b8cc8dab4b1" + "sha256:3566f8467cd350874c4913816355642a4942f6c1ed1e9406e3d42fae6d6c072a", + "sha256:b96f3bce3e54e3486ebe6504bc22bd4c140392bd2eb71764db29be8f2639aa65" ], "markers": "python_version >= '3.7'", - "version": "==1.5.2" + "version": "==1.5.3" }, "wrapt": { "hashes": [ @@ -3336,7 +3330,7 @@ "sha256:fbec11614dba0424ca72f4e8ba3c420dba07b4a7c206c8c8e4e73f2e98f4c559", "sha256:fd69666217b62fa5d7c6aa88e507493a34dec4fa20c5bd925e4bc12fce586639" ], - "markers": "python_version < '3.11'", + "markers": "python_version >= '3.11'", "version": "==1.15.0" }, "yarl": { @@ -3418,14 +3412,6 @@ ], "markers": "python_version >= '3.7'", "version": "==1.9.2" - }, - "zipp": { - "hashes": [ - "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b", - "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556" - ], - "markers": "python_version < '3.10'", - "version": "==3.15.0" } } } diff --git a/README.md b/README.md index e5b9774821..550b6d03fb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To submit an issue please visit https://issues.redhat.com/projects/COST/. ## Getting Started -This project is developed using Python 3.9. Make sure you have at least this version installed. +This project is developed using Python 3.11. Make sure you have at least this version installed. ### Prerequisites diff --git a/sonar-project.properties b/sonar-project.properties index da56707c31..1ddfe41131 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -13,7 +13,7 @@ sonar.host.url=https://sonarcloud.io #sonar.sourceEncoding=UTF-8 sonar.python.coverage.reportPaths=coverage.xml -sonar.python.version=3.9 +sonar.python.version=3.11 sonar.sources=. sonar.exclusions=**/test_*.py,**/test/**/*,**/*.html,**/*.yml,**/*.yaml,**/*.json,dev/scripts/**/*,**/*.sql From 30d5a56f65b9cd96821b092898949e1b7048668d Mon Sep 17 00:00:00 2001 From: Michael Skarbek Date: Fri, 9 Jun 2023 13:14:58 -0400 Subject: [PATCH 3/5] add gcc-c++ compiler Co-authored-by: Sam Doran --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0d5b013213..351b1b57eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ LABEL summary="$SUMMARY" \ # gcc to compile some python packages (e.g. ciso8601) # shadow-utils to make useradd available # libpq-devel needed for building psycopg2 -RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc shadow-utils libpq-devel" && \ +RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc gcc-c++ shadow-utils libpq-devel" && \ microdnf --nodocs -y upgrade && \ microdnf reinstall tzdata && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ From b1102843974391ed64bba7e76dc07ccd695c6fac Mon Sep 17 00:00:00 2001 From: maskarb Date: Tue, 20 Jun 2023 12:47:18 -0400 Subject: [PATCH 4/5] update test --- koku/providers/test/aws/test_aws_provider.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koku/providers/test/aws/test_aws_provider.py b/koku/providers/test/aws/test_aws_provider.py index 9914698da9..51e41e813d 100644 --- a/koku/providers/test/aws/test_aws_provider.py +++ b/koku/providers/test/aws/test_aws_provider.py @@ -92,7 +92,7 @@ def test_get_sts_access_fail(self, mock_boto3_client): mock_boto3_client.return_value = sts_client iam_arn = "arn:aws:s3:::my_s3_bucket" credentials = {"role_arn": iam_arn} - with self.assertLogs(level=logging.CRITICAL): + with self.assertLogs(level=logging.WARNING): aws_credentials = _get_sts_access(credentials) self.assertIn("aws_access_key_id", aws_credentials) self.assertIn("aws_secret_access_key", aws_credentials) From e5f7cb1339814b402d0924bf12e550ac3ce051a5 Mon Sep 17 00:00:00 2001 From: maskarb Date: Thu, 3 Aug 2023 10:50:31 -0400 Subject: [PATCH 5/5] replace gcc with gcc-c++ --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 351b1b57eb..f6ea1229d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ LABEL summary="$SUMMARY" \ # gcc to compile some python packages (e.g. ciso8601) # shadow-utils to make useradd available # libpq-devel needed for building psycopg2 -RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc gcc-c++ shadow-utils libpq-devel" && \ +RUN INSTALL_PKGS="python3.11 python3.11-devel glibc-langpack-en gcc-c++ shadow-utils libpq-devel" && \ microdnf --nodocs -y upgrade && \ microdnf reinstall tzdata && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \