From ce0ea2f77b9370f9751f148ec2bd425ccbd9f8ae Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 29 Apr 2025 13:42:54 -0600 Subject: [PATCH 1/4] setup.py hopeful fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d3f855e..1ae265e 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ long_description = fh.read() # Read dependencies from requirements.txt -with open("requirements.txt", "r", encoding="utf-8") as req_file: +with open("./requirements.txt", "r", encoding="utf-8") as req_file: requirements = req_file.read().splitlines() setup( From e63456b3607b35876d40d818c5c11e7125300ceb Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 29 Apr 2025 13:45:28 -0600 Subject: [PATCH 2/4] list out packages in setup.py --- setup.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 1ae265e..4d8f8d0 100644 --- a/setup.py +++ b/setup.py @@ -19,9 +19,6 @@ with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() -# Read dependencies from requirements.txt -with open("./requirements.txt", "r", encoding="utf-8") as req_file: - requirements = req_file.read().splitlines() setup( name="nmuwd", @@ -35,7 +32,22 @@ "Programming Language :: Python :: 3", "Operating System :: OS Independent", ], - install_requires=requirements, + install_requires=[ + "flask", + "frost_sta_client", + "Geoalchemy2", + "geopandas", + "google-cloud-storage", + "gunicorn", + "httpx", + "mypy", + "pandas", + "psycopg2", + "pytest", + "pyyaml", + "types-pyyaml", + "urllib3>=2.2.0,<3.0.0", + ], entry_points={ "console_scripts": [ "die = frontend.cli:cli", From b8e2f31d725d0855cd935cb827a0132868ca4c74 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 29 Apr 2025 13:47:02 -0600 Subject: [PATCH 3/4] only publish to pypi when merged with main --- .github/workflows/publish-to-pypi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 699394f..7fafcbf 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -7,6 +7,8 @@ name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI # pushing tags should be the only way to trigger this workflow on: push: + branches: + - main tags: - '*' From d861a779837d47cca2841ab7a0adf31bec9d31d9 Mon Sep 17 00:00:00 2001 From: Jacob Brown Date: Tue, 29 Apr 2025 14:03:53 -0600 Subject: [PATCH 4/4] bump to 0.9.4 --- .github/workflows/publish-to-pypi.yml | 2 -- setup.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 7fafcbf..699394f 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -7,8 +7,6 @@ name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI # pushing tags should be the only way to trigger this workflow on: push: - branches: - - main tags: - '*' diff --git a/setup.py b/setup.py index 4d8f8d0..6dad4c9 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( name="nmuwd", - version="0.9.3", + version="0.9.4", author="Jake Ross", description="New Mexico Water Data Integration Engine", long_description=long_description,