Merge pull request cherrytea-dev#561 from volodkindv/554-comon-code-fix-ci

Mikkdrasil · web-flow · commit 34068052c52c · 2025-01-18T13:58:55.000+01:00
fix deploy
diff --git a/.github/workflows/deploy_api_get_active_searches.yml b/.github/workflows/deploy_api_get_active_searches.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_archive_notifications.yml b/.github/workflows/deploy_archive_notifications.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_archive_to_bigquery.yml b/.github/workflows/deploy_archive_to_bigquery.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_check_first_posts_for_changes.yml b/.github/workflows/deploy_check_first_posts_for_changes.yml
@@ -16,6 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_check_topics_by_upd_time.yml b/.github/workflows/deploy_check_topics_by_upd_time.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_communicate.yml b/.github/workflows/deploy_communicate.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_compose_notifications.yml b/.github/workflows/deploy_compose_notifications.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_connect_to_forum.yml b/.github/workflows/deploy_connect_to_forum.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_identify_updates_of_first_posts.yml b/.github/workflows/deploy_identify_updates_of_first_posts.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_identify_updates_of_folders.yml b/.github/workflows/deploy_identify_updates_of_folders.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_identify_updates_of_topics.yml b/.github/workflows/deploy_identify_updates_of_topics.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_manage_topics.yml b/.github/workflows/deploy_manage_topics.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_manage_users.yml b/.github/workflows/deploy_manage_users.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_send_notifications.yml b/.github/workflows/deploy_send_notifications.yml
@@ -15,6 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_send_notifications_helper.yml b/.github/workflows/deploy_send_notifications_helper.yml
@@ -15,6 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_send_notifications_helper_2.yml b/.github/workflows/deploy_send_notifications_helper_2.yml
@@ -15,6 +15,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_title_recognize.yml b/.github/workflows/deploy_title_recognize.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_user_provide_info.yml b/.github/workflows/deploy_user_provide_info.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/.github/workflows/deploy_users_activate.yml b/.github/workflows/deploy_users_activate.yml
@@ -17,6 +17,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Make dependencies
+        run: make dependencies
+
       - name: Authenticate in GCP
         id: auth
         uses: google-github-actions/auth@v1
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,6 +9,8 @@ dependencies = [
     "google-cloud-secret-manager==2.16.0",
     "google-cloud-logging==3.5.0",
     "pydantic-settings==2.*",
+    "psycopg2-binary==2.9.5",
+    "SQLAlchemy==1.4.11",
 ]
 
 
@@ -22,29 +24,22 @@ develop = [
     "ruff>=0.8",
     "uv>=0.5.15",
     "pytest-xdist==3.*",
-    "pyannotate==1.2.*"
+    "pyannotate==1.2.*",
 ]
 
 api_get_active_searches = [
-    "psycopg2-binary==2.9.5",
     "beautifulsoup4==4.9.3",    # do we need to update it?
     "lxml==4.9.1",
     "functions-framework==3.*",
 ]
 
-archive_notifications = ["SQLAlchemy==1.4.11", "psycopg2-binary==2.9.5", "pytz"]
+archive_notifications = ["pytz"]
 
-archive_to_bigquery = [
-    "SQLAlchemy==1.4.11",
-    "psycopg2-binary==2.9.5",
-    "google-cloud-bigquery==3.27.0",
-]
+archive_to_bigquery = ["google-cloud-bigquery==3.27.0"]
 
 check_first_posts_for_changes = [
     "requests==2.31.0",
-    "SQLAlchemy==1.4.11",
-    "psycopg2-binary==2.9.5",
-    "google-auth==2.19.1",    # for API calls to other Google Cloud Functions
+    "google-auth==2.19.1", # for API calls to other Google Cloud Functions
 ]
 
 check_topics_by_upd_time = [
@@ -54,38 +49,32 @@ check_topics_by_upd_time = [
 ]
 
 communicate = [
-    "psycopg2-binary==2.9.5",
     "python-telegram-bot[rate-limiter, job-queue]==20.2",
     "httpx==0.23.3",
 ]
 
 compose_notifications = [
     "requests==2.31.0",
-    "urllib3==1.26.18",       # http client
-    "idna==2.10",             # translation of domain names
-    "certifi==2023.7.22",     # SSL certificates
-    "chardet==4.0.0",         # encoding detector
-    "python-dateutil",        # extension to datetime module
-    "pytz==2021.1",           # timezone
-    "SQLAlchemy==1.4.11",
-    "psycopg2-binary==2.9.5",
+    "urllib3==1.26.18",   # http client
+    "idna==2.10",         # translation of domain names
+    "certifi==2023.7.22", # SSL certificates
+    "chardet==4.0.0",     # encoding detector
+    "python-dateutil",    # extension to datetime module
+    "pytz==2021.1",       # timezone
 ]
 
 connect_to_forum = [
     "requests==2.31.0",
     "urllib3==1.26.18",
     "beautifulsoup4==4.9.3",
     "lxml==4.9.1",
-    "psycopg2-binary==2.9.5",
     "python-telegram-bot[rate-limiter, job-queue]==20.2",
     "httpx==0.23.3",
 ]
 
 identify_updates_of_first_posts = [
     "requests==2.31.0",
-    "SQLAlchemy==1.4.11",     # <-- old version, but still works
-    "psycopg2-binary==2.9.5",
-    "beautifulsoup4==4.9.3",  # do we need to update it?
+    "beautifulsoup4==4.9.3", # do we need to update it?
     "lxml==4.9.1",
 ]
 
@@ -108,42 +97,25 @@ identify_updates_of_topics = [
     "python-dateutil==2.8.2",       # extension to datetime module
     "geopy==2.2.0",                 # geocoding / coordinates
     "yandex-geocoder==3.0.1",       # # geocoding / coordinates
-    "SQLAlchemy==1.4.11",
-    "psycopg2-binary==2.9.5",
     "natasha==1.4.0",               # recognition of person and location within text string
     "google-cloud-storage==2.10.0",
     "google-auth==2.19.1",          # for API calls to other Google Cloud Functions
 ]
 
-manage_topics = [
-    "SQLAlchemy==1.4.11",     # <-- old version, but still works
-    "psycopg2-binary==2.9.5",
-]
+manage_topics = []
 
-manage_users = ["psycopg2-binary==2.9.5"]
+manage_users = []
 
 send_debug_to_admin = [
     "python-telegram-bot[rate-limiter, job-queue]==20.2",
     "httpx==0.23.3",
 ]
 
-send_notifications = [
-    "urllib3==1.26.18",
-    "psycopg2-binary==2.9.5",
-    "httpx==0.23.3",
-]
+send_notifications = ["urllib3==1.26.18", "httpx==0.23.3"]
 
-send_notifications_helper = [
-    "urllib3==1.26.18",
-    "psycopg2-binary==2.9.5",
-    "httpx==0.23.3",
-]
+send_notifications_helper = ["urllib3==1.26.18", "httpx==0.23.3"]
 
-send_notifications_helper_2 = [
-    "urllib3==1.26.18",
-    "psycopg2-binary==2.9.5",
-    "httpx==0.23.3",
-]
+send_notifications_helper_2 = ["urllib3==1.26.18", "httpx==0.23.3"]
 
 title_recognize = [
     "python-dateutil==2.8.2",     # extension to datetime module
@@ -152,13 +124,12 @@ title_recognize = [
 ]
 
 user_provide_info = [
-    "psycopg2-binary==2.9.5",
     "beautifulsoup4==4.9.3",    # do we need to update it?
     "lxml==4.9.1",
     "functions-framework==3.*",
 ]
 
-users_activate = ["psycopg2-binary==2.9.5"]
+users_activate = []
 
 
 [tool.ruff]
diff --git a/src/api_get_active_searches/requirements.txt b/src/api_get_active_searches/requirements.txt
@@ -21,6 +21,7 @@ google-cloud-logging==3.5.0
 google-cloud-pubsub==2.16.0
 google-cloud-secret-manager==2.16.0
 googleapis-common-protos==1.66.0
+greenlet==3.1.1
 grpc-google-iam-v1==0.14.0
 grpcio==1.69.0
 grpcio-status==1.62.3
@@ -46,6 +47,7 @@ rsa==4.9
 setuptools==75.7.0 ; sys_platform != 'win32'
 six==1.17.0
 soupsieve==2.6
+sqlalchemy==1.4.11
 typing-extensions==4.12.2
 urllib3==1.26.18
 watchdog==6.0.0
diff --git a/src/check_topics_by_upd_time/requirements.txt b/src/check_topics_by_upd_time/requirements.txt
@@ -14,13 +14,15 @@ google-cloud-logging==3.5.0
 google-cloud-pubsub==2.16.0
 google-cloud-secret-manager==2.16.0
 googleapis-common-protos==1.66.0
+greenlet==3.1.1
 grpc-google-iam-v1==0.14.0
 grpcio==1.69.0
 grpcio-status==1.62.3
 idna==2.10
 lxml==4.9.1
 proto-plus==1.25.0
 protobuf==4.25.5
+psycopg2-binary==2.9.5
 pyasn1==0.6.1
 pyasn1-modules==0.4.1
 pydantic==2.10.4
@@ -31,5 +33,6 @@ requests==2.31.0
 rsa==4.9
 six==1.17.0
 soupsieve==2.6
+sqlalchemy==1.4.11
 typing-extensions==4.12.2
 urllib3==1.26.18
diff --git a/src/communicate/requirements.txt b/src/communicate/requirements.txt
@@ -17,6 +17,7 @@ google-cloud-logging==3.5.0
 google-cloud-pubsub==2.16.0
 google-cloud-secret-manager==2.16.0
 googleapis-common-protos==1.66.0
+greenlet==3.1.1
 grpc-google-iam-v1==0.14.0
 grpcio==1.69.0
 grpcio-status==1.62.3
@@ -40,6 +41,7 @@ rfc3986==1.5.0
 rsa==4.9
 six==1.17.0
 sniffio==1.3.1
+sqlalchemy==1.4.11
 typing-extensions==4.12.2
 tzdata==2024.2 ; sys_platform == 'win32'
 tzlocal==5.2
diff --git a/src/connect_to_forum/requirements.txt b/src/connect_to_forum/requirements.txt
diff --git a/src/identify_updates_of_folders/requirements.txt b/src/identify_updates_of_folders/requirements.txt
diff --git a/src/manage_users/requirements.txt b/src/manage_users/requirements.txt
diff --git a/src/send_debug_to_admin/requirements.txt b/src/send_debug_to_admin/requirements.txt
diff --git a/src/send_notifications/requirements.txt b/src/send_notifications/requirements.txt
diff --git a/src/send_notifications_helper/requirements.txt b/src/send_notifications_helper/requirements.txt
diff --git a/src/send_notifications_helper_2/requirements.txt b/src/send_notifications_helper_2/requirements.txt
diff --git a/src/title_recognize/requirements.txt b/src/title_recognize/requirements.txt
diff --git a/src/user_provide_info/requirements.txt b/src/user_provide_info/requirements.txt
diff --git a/src/users_activate/requirements.txt b/src/users_activate/requirements.txt
diff --git a/uv.lock b/uv.lock
