Skip to content

Commit e3493a6

Browse files
committed
Remove version specifiers on extract_and_load package versions
Use lock file to fix versions and reducing maintenance burden.
1 parent a396595 commit e3493a6

9 files changed

Lines changed: 194 additions & 136 deletions

File tree

warehouses/accelerator/extract_load/accelerator_sharepoint/extract_and_load.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# /// script
22
# requires-python = ">=3.13"
33
# dependencies = [
4-
# "openpyxl>=3.1.5,<3.2",
5-
# "pandas>=2.2.3,<2.3.0",
4+
# "openpyxl",
5+
# "pandas",
66
# "elt-common[m365]",
77
# ]
88
#

warehouses/accelerator/extract_load/accelerator_sharepoint/extract_and_load.py.lock

Lines changed: 48 additions & 35 deletions
Large diffs are not rendered by default.

warehouses/accelerator/extract_load/electricity_sharepoint/extract_and_load.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# /// script
22
# requires-python = ">=3.13"
33
# dependencies = [
4-
# "pandas~=2.3.1",
4+
# "pandas",
55
# "elt-common[m365]",
6-
# "python-calamine~=0.4.0",
6+
# "python-calamine",
77
# ]
88
#
99
# [tool.uv.sources]

warehouses/accelerator/extract_load/electricity_sharepoint/extract_and_load.py.lock

Lines changed: 77 additions & 39 deletions
Large diffs are not rendered by default.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OPRALOGWEB__SOURCES__CREDENTIALS__DRIVERNAME=mssql+pymssql
2+
OPRALOGWEB__SOURCES__CREDENTIALS__DATABASE=OpralogWebDB
3+
OPRALOGWEB__SOURCES__CREDENTIALS__SCHEMA=dbo
4+
OPRALOGWEB__SOURCES__CREDENTIALS__PORT=1433
5+
OPRALOGWEB__SOURCES__CREDENTIALS__HOST=fitgensql1.isis.cclrc.ac.uk
6+
OPRALOGWEB__SOURCES__CREDENTIALS__USERNAME=dataplatform-ingest
7+
OPRALOGWEB__SOURCES__CREDENTIALS__PASSWORD=Martyn!123

warehouses/accelerator/extract_load/opralogweb/extract_and_load.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# requires-python = "==3.13.*"
44
# dependencies = [
55
# "dlt[sql-database]",
6-
# "html2text==2025.4.15",
7-
# "pandas~=2.3.1",
6+
# "html2text",
7+
# "pandas",
88
# "elt-common",
9-
# "pymssql~=2.3.4",
9+
# "pymssql",
1010
# ]
1111
#
1212
# [tool.uv.sources]

warehouses/accelerator/extract_load/opralogweb/extract_and_load.py.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ requires-python = "==3.13.*"
66
requirements = [
77
{ name = "dlt", extras = ["sql-database"] },
88
{ name = "elt-common", directory = "../../../../elt-common" },
9-
{ name = "html2text", specifier = "==2025.4.15" },
10-
{ name = "pandas", specifier = "~=2.3.1" },
11-
{ name = "pymssql", specifier = "~=2.3.4" },
9+
{ name = "html2text" },
10+
{ name = "pandas" },
11+
{ name = "pymssql" },
1212
]
1313

1414
[[package]]
@@ -249,29 +249,29 @@ dependencies = [
249249

250250
[package.metadata]
251251
requires-dist = [
252-
{ name = "authlib", marker = "extra == 'm365'", specifier = "~=1.6.1" },
253-
{ name = "click", marker = "extra == 'iceberg-maintenance'", specifier = "~=8.2.1" },
254-
{ name = "dlt", extras = ["parquet", "s3"], specifier = "~=1.20.0" },
255-
{ name = "httpx", marker = "extra == 'm365'", specifier = "~=0.28.1" },
252+
{ name = "authlib", marker = "extra == 'm365'", specifier = ">=1.6.1" },
253+
{ name = "click", marker = "extra == 'iceberg-maintenance'", specifier = ">=8.2.1" },
254+
{ name = "dlt", extras = ["parquet", "s3"], specifier = ">=1.20,<2" },
255+
{ name = "httpx", marker = "extra == 'm365'", specifier = ">=0.28.1" },
256256
{ name = "pyarrow", specifier = "==21.0.0" },
257-
{ name = "pyiceberg", specifier = "~=0.9.1" },
258-
{ name = "sqlalchemy", marker = "extra == 'iceberg-maintenance'", specifier = "~=2.0.43" },
259-
{ name = "tenacity", marker = "extra == 'm365'", specifier = "~=9.1.2" },
260-
{ name = "trino", marker = "extra == 'iceberg-maintenance'", specifier = "~=0.336.0" },
257+
{ name = "pyiceberg", specifier = "==0.9.1" },
258+
{ name = "sqlalchemy", marker = "extra == 'iceberg-maintenance'", specifier = ">=2.0.43" },
259+
{ name = "tenacity", marker = "extra == 'm365'", specifier = ">=9.1.2" },
260+
{ name = "trino", marker = "extra == 'iceberg-maintenance'", specifier = ">=0.336.0" },
261261
]
262262
provides-extras = ["iceberg-maintenance", "m365"]
263263

264264
[package.metadata.requires-dev]
265265
dev = [
266-
{ name = "minio", specifier = "~=7.2.16" },
267-
{ name = "prek", specifier = ">=0.1.6" },
268-
{ name = "pydantic-settings", specifier = "~=2.10.1" },
269-
{ name = "pytest", specifier = "~=8.3.5" },
270-
{ name = "pytest-httpx", specifier = "~=0.35.0" },
271-
{ name = "pytest-mock", specifier = "~=3.14.1" },
272-
{ name = "requests", specifier = "~=2.32.3" },
273-
{ name = "requests-mock", specifier = "~=1.12.1" },
274-
{ name = "ruff", specifier = "~=0.11.11" },
266+
{ name = "minio", specifier = ">=7.2.20" },
267+
{ name = "prek", specifier = ">=0.2.27" },
268+
{ name = "pydantic-settings", specifier = ">=2.10.1" },
269+
{ name = "pytest", specifier = ">=9.0.2" },
270+
{ name = "pytest-httpx", specifier = ">=0.36.0" },
271+
{ name = "pytest-mock", specifier = ">=3.15.1" },
272+
{ name = "requests", specifier = ">=2.32.5" },
273+
{ name = "requests-mock", specifier = ">=1.12.1" },
274+
{ name = "ruff", specifier = ">=0.14.10" },
275275
]
276276

277277
[[package]]

warehouses/accelerator/extract_load/statusdisplay/extract_and_load.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# /// script
33
# requires-python = "==3.13.*"
44
# dependencies = [
5-
# "pandas>=2.2.3,<2.3.0",
5+
# "pandas",
66
# "elt-common",
77
# ]
88
#

warehouses/accelerator/extract_load/statusdisplay/extract_and_load.py.lock

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ requires-python = "==3.13.*"
55
[manifest]
66
requirements = [
77
{ name = "elt-common", directory = "../../../../elt-common" },
8-
{ name = "pandas", specifier = ">=2.2.3,<2.3.0" },
8+
{ name = "pandas" },
99
]
1010

1111
[[package]]
@@ -243,29 +243,29 @@ dependencies = [
243243

244244
[package.metadata]
245245
requires-dist = [
246-
{ name = "authlib", marker = "extra == 'm365'", specifier = "~=1.6.1" },
247-
{ name = "click", marker = "extra == 'iceberg-maintenance'", specifier = "~=8.2.1" },
248-
{ name = "dlt", extras = ["parquet", "s3"], specifier = "~=1.20.0" },
249-
{ name = "httpx", marker = "extra == 'm365'", specifier = "~=0.28.1" },
246+
{ name = "authlib", marker = "extra == 'm365'", specifier = ">=1.6.1" },
247+
{ name = "click", marker = "extra == 'iceberg-maintenance'", specifier = ">=8.2.1" },
248+
{ name = "dlt", extras = ["parquet", "s3"], specifier = ">=1.20,<2" },
249+
{ name = "httpx", marker = "extra == 'm365'", specifier = ">=0.28.1" },
250250
{ name = "pyarrow", specifier = "==21.0.0" },
251-
{ name = "pyiceberg", specifier = "~=0.9.1" },
252-
{ name = "sqlalchemy", marker = "extra == 'iceberg-maintenance'", specifier = "~=2.0.43" },
253-
{ name = "tenacity", marker = "extra == 'm365'", specifier = "~=9.1.2" },
254-
{ name = "trino", marker = "extra == 'iceberg-maintenance'", specifier = "~=0.336.0" },
251+
{ name = "pyiceberg", specifier = "==0.9.1" },
252+
{ name = "sqlalchemy", marker = "extra == 'iceberg-maintenance'", specifier = ">=2.0.43" },
253+
{ name = "tenacity", marker = "extra == 'm365'", specifier = ">=9.1.2" },
254+
{ name = "trino", marker = "extra == 'iceberg-maintenance'", specifier = ">=0.336.0" },
255255
]
256256
provides-extras = ["iceberg-maintenance", "m365"]
257257

258258
[package.metadata.requires-dev]
259259
dev = [
260-
{ name = "minio", specifier = "~=7.2.16" },
261-
{ name = "prek", specifier = ">=0.1.6" },
262-
{ name = "pydantic-settings", specifier = "~=2.10.1" },
263-
{ name = "pytest", specifier = "~=8.3.5" },
264-
{ name = "pytest-httpx", specifier = "~=0.35.0" },
265-
{ name = "pytest-mock", specifier = "~=3.14.1" },
266-
{ name = "requests", specifier = "~=2.32.3" },
267-
{ name = "requests-mock", specifier = "~=1.12.1" },
268-
{ name = "ruff", specifier = "~=0.11.11" },
260+
{ name = "minio", specifier = ">=7.2.20" },
261+
{ name = "prek", specifier = ">=0.2.27" },
262+
{ name = "pydantic-settings", specifier = ">=2.10.1" },
263+
{ name = "pytest", specifier = ">=9.0.2" },
264+
{ name = "pytest-httpx", specifier = ">=0.36.0" },
265+
{ name = "pytest-mock", specifier = ">=3.15.1" },
266+
{ name = "requests", specifier = ">=2.32.5" },
267+
{ name = "requests-mock", specifier = ">=1.12.1" },
268+
{ name = "ruff", specifier = ">=0.14.10" },
269269
]
270270

271271
[[package]]
@@ -548,29 +548,29 @@ wheels = [
548548

549549
[[package]]
550550
name = "pandas"
551-
version = "2.2.3"
551+
version = "2.3.3"
552552
source = { registry = "https://pypi.org/simple" }
553553
dependencies = [
554554
{ name = "numpy" },
555555
{ name = "python-dateutil" },
556556
{ name = "pytz" },
557557
{ name = "tzdata" },
558558
]
559-
sdist = { url = "https://files.pythonhosted.org/packages/9c/d6/9f8431bacc2e19dca897724cd097b1bb224a6ad5433784a44b587c7c13af/pandas-2.2.3.tar.gz", hash = "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667", size = 4399213, upload-time = "2024-09-20T13:10:04.827Z" }
560-
wheels = [
561-
{ url = "https://files.pythonhosted.org/packages/64/22/3b8f4e0ed70644e85cfdcd57454686b9057c6c38d2f74fe4b8bc2527214a/pandas-2.2.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015", size = 12477643, upload-time = "2024-09-20T13:09:25.522Z" },
562-
{ url = "https://files.pythonhosted.org/packages/e4/93/b3f5d1838500e22c8d793625da672f3eec046b1a99257666c94446969282/pandas-2.2.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28", size = 11281573, upload-time = "2024-09-20T13:09:28.012Z" },
563-
{ url = "https://files.pythonhosted.org/packages/f5/94/6c79b07f0e5aab1dcfa35a75f4817f5c4f677931d4234afcd75f0e6a66ca/pandas-2.2.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0", size = 15196085, upload-time = "2024-09-20T19:02:10.451Z" },
564-
{ url = "https://files.pythonhosted.org/packages/e8/31/aa8da88ca0eadbabd0a639788a6da13bb2ff6edbbb9f29aa786450a30a91/pandas-2.2.3-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24", size = 12711809, upload-time = "2024-09-20T13:09:30.814Z" },
565-
{ url = "https://files.pythonhosted.org/packages/ee/7c/c6dbdb0cb2a4344cacfb8de1c5808ca885b2e4dcfde8008266608f9372af/pandas-2.2.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659", size = 16356316, upload-time = "2024-09-20T19:02:13.825Z" },
566-
{ url = "https://files.pythonhosted.org/packages/57/b7/8b757e7d92023b832869fa8881a992696a0bfe2e26f72c9ae9f255988d42/pandas-2.2.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb", size = 14022055, upload-time = "2024-09-20T13:09:33.462Z" },
567-
{ url = "https://files.pythonhosted.org/packages/3b/bc/4b18e2b8c002572c5a441a64826252ce5da2aa738855747247a971988043/pandas-2.2.3-cp313-cp313-win_amd64.whl", hash = "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d", size = 11481175, upload-time = "2024-09-20T13:09:35.871Z" },
568-
{ url = "https://files.pythonhosted.org/packages/76/a3/a5d88146815e972d40d19247b2c162e88213ef51c7c25993942c39dbf41d/pandas-2.2.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468", size = 12615650, upload-time = "2024-09-20T13:09:38.685Z" },
569-
{ url = "https://files.pythonhosted.org/packages/9c/8c/f0fd18f6140ddafc0c24122c8a964e48294acc579d47def376fef12bcb4a/pandas-2.2.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18", size = 11290177, upload-time = "2024-09-20T13:09:41.141Z" },
570-
{ url = "https://files.pythonhosted.org/packages/ed/f9/e995754eab9c0f14c6777401f7eece0943840b7a9fc932221c19d1abee9f/pandas-2.2.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2", size = 14651526, upload-time = "2024-09-20T19:02:16.905Z" },
571-
{ url = "https://files.pythonhosted.org/packages/25/b0/98d6ae2e1abac4f35230aa756005e8654649d305df9a28b16b9ae4353bff/pandas-2.2.3-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4", size = 11871013, upload-time = "2024-09-20T13:09:44.39Z" },
572-
{ url = "https://files.pythonhosted.org/packages/cc/57/0f72a10f9db6a4628744c8e8f0df4e6e21de01212c7c981d31e50ffc8328/pandas-2.2.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d", size = 15711620, upload-time = "2024-09-20T19:02:20.639Z" },
573-
{ url = "https://files.pythonhosted.org/packages/ab/5f/b38085618b950b79d2d9164a711c52b10aefc0ae6833b96f626b7021b2ed/pandas-2.2.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a", size = 13098436, upload-time = "2024-09-20T13:09:48.112Z" },
559+
sdist = { url = "https://files.pythonhosted.org/packages/33/01/d40b85317f86cf08d853a4f495195c73815fdf205eef3993821720274518/pandas-2.3.3.tar.gz", hash = "sha256:e05e1af93b977f7eafa636d043f9f94c7ee3ac81af99c13508215942e64c993b", size = 4495223, upload-time = "2025-09-29T23:34:51.853Z" }
560+
wheels = [
561+
{ url = "https://files.pythonhosted.org/packages/cd/4b/18b035ee18f97c1040d94debd8f2e737000ad70ccc8f5513f4eefad75f4b/pandas-2.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:56851a737e3470de7fa88e6131f41281ed440d29a9268dcbf0002da5ac366713", size = 11544671, upload-time = "2025-09-29T23:21:05.024Z" },
562+
{ url = "https://files.pythonhosted.org/packages/31/94/72fac03573102779920099bcac1c3b05975c2cb5f01eac609faf34bed1ca/pandas-2.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bdcd9d1167f4885211e401b3036c0c8d9e274eee67ea8d0758a256d60704cfe8", size = 10680807, upload-time = "2025-09-29T23:21:15.979Z" },
563+
{ url = "https://files.pythonhosted.org/packages/16/87/9472cf4a487d848476865321de18cc8c920b8cab98453ab79dbbc98db63a/pandas-2.3.3-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e32e7cc9af0f1cc15548288a51a3b681cc2a219faa838e995f7dc53dbab1062d", size = 11709872, upload-time = "2025-09-29T23:21:27.165Z" },
564+
{ url = "https://files.pythonhosted.org/packages/15/07/284f757f63f8a8d69ed4472bfd85122bd086e637bf4ed09de572d575a693/pandas-2.3.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:318d77e0e42a628c04dc56bcef4b40de67918f7041c2b061af1da41dcff670ac", size = 12306371, upload-time = "2025-09-29T23:21:40.532Z" },
565+
{ url = "https://files.pythonhosted.org/packages/33/81/a3afc88fca4aa925804a27d2676d22dcd2031c2ebe08aabd0ae55b9ff282/pandas-2.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4e0a175408804d566144e170d0476b15d78458795bb18f1304fb94160cabf40c", size = 12765333, upload-time = "2025-09-29T23:21:55.77Z" },
566+
{ url = "https://files.pythonhosted.org/packages/8d/0f/b4d4ae743a83742f1153464cf1a8ecfafc3ac59722a0b5c8602310cb7158/pandas-2.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:93c2d9ab0fc11822b5eece72ec9587e172f63cff87c00b062f6e37448ced4493", size = 13418120, upload-time = "2025-09-29T23:22:10.109Z" },
567+
{ url = "https://files.pythonhosted.org/packages/4f/c7/e54682c96a895d0c808453269e0b5928a07a127a15704fedb643e9b0a4c8/pandas-2.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:f8bfc0e12dc78f777f323f55c58649591b2cd0c43534e8355c51d3fede5f4dee", size = 10993991, upload-time = "2025-09-29T23:25:04.889Z" },
568+
{ url = "https://files.pythonhosted.org/packages/f9/ca/3f8d4f49740799189e1395812f3bf23b5e8fc7c190827d55a610da72ce55/pandas-2.3.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:75ea25f9529fdec2d2e93a42c523962261e567d250b0013b16210e1d40d7c2e5", size = 12048227, upload-time = "2025-09-29T23:22:24.343Z" },
569+
{ url = "https://files.pythonhosted.org/packages/0e/5a/f43efec3e8c0cc92c4663ccad372dbdff72b60bdb56b2749f04aa1d07d7e/pandas-2.3.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:74ecdf1d301e812db96a465a525952f4dde225fdb6d8e5a521d47e1f42041e21", size = 11411056, upload-time = "2025-09-29T23:22:37.762Z" },
570+
{ url = "https://files.pythonhosted.org/packages/46/b1/85331edfc591208c9d1a63a06baa67b21d332e63b7a591a5ba42a10bb507/pandas-2.3.3-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6435cb949cb34ec11cc9860246ccb2fdc9ecd742c12d3304989017d53f039a78", size = 11645189, upload-time = "2025-09-29T23:22:51.688Z" },
571+
{ url = "https://files.pythonhosted.org/packages/44/23/78d645adc35d94d1ac4f2a3c4112ab6f5b8999f4898b8cdf01252f8df4a9/pandas-2.3.3-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:900f47d8f20860de523a1ac881c4c36d65efcb2eb850e6948140fa781736e110", size = 12121912, upload-time = "2025-09-29T23:23:05.042Z" },
572+
{ url = "https://files.pythonhosted.org/packages/53/da/d10013df5e6aaef6b425aa0c32e1fc1f3e431e4bcabd420517dceadce354/pandas-2.3.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:a45c765238e2ed7d7c608fc5bc4a6f88b642f2f01e70c0c23d2224dd21829d86", size = 12712160, upload-time = "2025-09-29T23:23:28.57Z" },
573+
{ url = "https://files.pythonhosted.org/packages/bd/17/e756653095a083d8a37cbd816cb87148debcfcd920129b25f99dd8d04271/pandas-2.3.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c4fc4c21971a1a9f4bdb4c73978c7f7256caa3e62b323f70d6cb80db583350bc", size = 13199233, upload-time = "2025-09-29T23:24:24.876Z" },
574574
]
575575

576576
[[package]]

0 commit comments

Comments
 (0)