Updated dependencies

renzo · renzon · commit bb366faa2a4a · 2024-02-28T14:34:55.000-03:00
diff --git a/.github/workflows/django_project.yml b/.github/workflows/django_project.yml
@@ -24,10 +24,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.10
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
       - name: Copying configurations
         run: |
           cp contrib/env-sample .env
diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,7 @@ name = "pypi"
 boto3 = "*"
 collectfast = "*"
 dj-database-url = "*"
-django = "*"
+django = "<5"
 django-debug-toolbar = "*"
 django-ordered-model = "*"
 "django-s3-folder-storage" = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pythonpro/core/forms.py b/pythonpro/core/forms.py
@@ -1,7 +1,7 @@
 from collections import ChainMap
 
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Checkbox
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Checkbox
 from django import forms
 from django.conf import settings
 from django.contrib.auth.forms import UserCreationForm, PasswordResetForm
diff --git a/pythonpro/discord/api_client.py b/pythonpro/discord/api_client.py
@@ -35,17 +35,17 @@ class DiscordBotClient:
     def __init__(self, bot_token: str):
         self._bot_token = bot_token
 
-    def list_guild_members(self, guild_id, limit=1, after=0) -> dict:
+    def list_guild_members(self, guild_id, limit=100, after=0) -> dict:
         """
         :param guild_id: the discord server id
         """
         headers = {
             'Authorization': f'Bot {self._bot_token}'
         }
-        # data = {'limit': limit, 'after': after}
+        params = {'limit': limit, 'after': after}
         r = requests.get(
             f'{_BASE_ENDPOINT_URI}/guilds/{guild_id}/members',
-            # data=data,
+            params=params,
             headers=headers)
         try:
             r.raise_for_status()
@@ -141,6 +141,7 @@ def generate_api_client(self, autorization_code: str) -> Union[DiscordAppClient,
 
 
 if __name__ == '__main__':
-    c = DiscordBotClient('MTAwNDU0MTg3NTk1NDQwNTQzNg.GFcT5X.Kp4gVn0U1kOPvdwLku-oki7LI_wtbMma2E_ET4')
+    import decouple
+    c = DiscordBotClient(decouple.config('DISCORD_APP_BOT_TOKEN'))
     members = c.list_guild_members(971162582624903288)
     print(members)
diff --git a/pythonpro/domain/subscription_domain.py b/pythonpro/domain/subscription_domain.py
@@ -16,7 +16,7 @@
 from pythonpro.memberkit.models import Subscription, SubscriptionType
 
 _logger = Logger(__file__)
-run_until_available = shared_task(autoretry_for=(JSONDecodeError,), retry_backoff=True, max_retries=None)
+run_until_available = shared_task(autoretry_for=(JSONDecodeError,), retry_backoff=True, max_retries=20)
 
 
 def validate_has_discourse_api_configuration():
diff --git a/pythonpro/settings.py b/pythonpro/settings.py
@@ -73,7 +73,7 @@
     RECAPTCHA_PRIVATE_KEY = config('RECAPTCHA_PRIVATE_KEY')
     RECAPTCHA_REQUIRED_SCORE = 0.85
 else:
-    SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error']
+    SILENCED_SYSTEM_CHECKS = ['django_recaptcha.recaptcha_test_key_error']
 
 # Application definition
 
@@ -90,7 +90,7 @@
     'pythonpro.redirector',
     'pythonpro.pages',
     'pythonpro.memberkit',
-    'captcha',
+    'django_recaptcha',
     'rolepermissions',
     'ordered_model',
     'django.contrib.admin',
