fixed merge conflict

keithrozario · Jan 3, 2024 · 4a86d37 · 4a86d37
2 parents 1bbad69 + 8363869
commit 4a86d37
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/pipeline/config/packages_p310.csv b/pipeline/config/packages_p310.csv
@@ -6,8 +6,10 @@ beautifulsoup4,MIT,Leonard Richardson <[email protected]>
 boto3,Apache-2.0,AWS
 cryptography,Apache-2.0,The Python Cryptographic Authority and individual contributors <[email protected]>
 dynamodb-encryption-sdk,Apache-2.0,<[email protected]>
+fastapi, MIT, Sebastián Ramírez <[email protected]>
 idna,https://github.com/kjd/idna/blob/master/LICENSE.rst,Kim Davis [email protected]
 jinja2,BSD,Armin Ronache <[email protected]>; Pallets <[email protected]>
+mangum, MIT, Jordan Eremieff
 numpy,https://www.numpy.org/license.html,[email protected]
 openpyxl,MIT,Charlie Clark <[email protected]>
 pandas,BSD,<[email protected]>
@@ -22,3 +24,8 @@ mysql-connector-python,GNU GPLv2,Oracle
 Pillow,https://github.com/python-pillow/Pillow/blob/main/LICENSE,Jeffrey A. Clark
 aliyun-python-sdk-actiontrail,Apache-2.0,Aliyun <[email protected]>
 tabulate,MIT,[email protected]
+paramiko,GNU GPLv2,Jeff Forcier <[email protected]>
+pydantic,MIT,Samuel Colvin <[email protected]>
+polars,MIT,Ritchie Vink <[email protected]>
+s3fs,BSD,Matthew Rocklin
+zeep,MIT, Michael van Tellingen <[email protected]>
diff --git a/pipeline/config/packages_p311-arm64.csv b/pipeline/config/packages_p311-arm64.csv
@@ -10,6 +10,7 @@ idna,https://github.com/kjd/idna/blob/master/LICENSE.rst,Kim Davis kim@cynosure.
 jinja2,BSD,Armin Ronache <[email protected]>; Pallets <[email protected]>
 numpy,https://www.numpy.org/license.html,[email protected]
 pandas,BSD,<[email protected]>
+Pillow,https://github.com/python-pillow/Pillow/blob/master/LICENSE,Alex Clark <[email protected]>
 pyqldb,Apache-2.0,AWS
 redshift-connector,Apache License Version 2.0,Amazon Web Services <[email protected]>
 requests,Apache-2.0,Kenneth Reitz <[email protected]>

diff --git a/pipeline/config/packages_p311.csv b/pipeline/config/packages_p311.csv
@@ -1,13 +1,17 @@
 Package_Name,License,Authors/Maintainers
+aws-psycopg2,MIT,<[email protected]>
 aws-xray-sdk,Apache-2.0,AWS
 aws-requests-auth,BSD,[email protected]
 bcrypt,Apache-2.0,[email protected]
 beautifulsoup4,MIT,Leonard Richardson <[email protected]>
 boto3,Apache-2.0,AWS
 cryptography,Apache-2.0,The Python Cryptographic Authority and individual contributors <[email protected]>
 dynamodb-encryption-sdk,Apache-2.0,<[email protected]>
+fastapi, MIT, Sebastián Ramírez <[email protected]>
+google-cloud-bigquery,Apache 2.0,Google LLC
 idna,https://github.com/kjd/idna/blob/master/LICENSE.rst,Kim Davis [email protected]
 jinja2,BSD,Armin Ronache <[email protected]>; Pallets <[email protected]>
+mangum, MIT, Jordan Eremieff
 matplotlib,PSF,[email protected]
 mysql-connector-python,GNU GPLv2,Oracle
 numpy,https://www.numpy.org/license.html,[email protected]
@@ -17,3 +21,16 @@ pyqldb,Apache-2.0,AWS
 redshift-connector,Apache License Version 2.0,Amazon Web Services <[email protected]>
 requests,Apache-2.0,Kenneth Reitz <[email protected]>
 tabulate,MIT,[email protected]
+requests-html,MIT,Kenneth Reitz <[email protected]>
+elasticsearch,Apache-2.0,Honza Kral <[email protected]>; Nick Lang <[email protected]>
+Pillow,https://github.com/python-pillow/Pillow/blob/master/LICENSE,Alex Clark <[email protected]>
+psycopg,LGPL-3.0,Daniele Varrazzo <[email protected]>
+pymysql,MIT,[email protected]
+selenium,Apache Software License (Apache 2.0),The Selenium Project
+paramiko,GNU GPLv2,Jeff Forcier <[email protected]>
+pydantic,MIT,Samuel Colvin <[email protected]>
+polars,MIT,Ritchie Vink <[email protected]>
+s3fs,BSD,Matthew Rocklin
+zeep,MIT, Michael van Tellingen <[email protected]>
+XlsxWriter, BSD 2-Clause, John McNamara <[email protected]>
+xlsx2csv, MIT, Dilshod Temirkhdojaev <[email protected]>