Merge branch 'main' into dependabot/pip/redis-4.4.4

euribates · web-flow · commit 3cc1c8ab4800 · 2025-02-17T13:52:00.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,4 +16,4 @@ jobs:
           host: pythoncanarias.es
           username: ${{ secrets.PRODUCTION_SSH_USERNAME }}
           key: ${{ secrets.PRODUCTION_SSH_KEY }}
-          script: source ~/.virtualenvs/web/bin/activate && cd ~/web && ./deploy.sh
+          script: source ~/.pyenv/versions/pycanweb/bin/activate && cd ~/web && ./deploy.sh
diff --git a/__init__.py b/__init__.py
diff --git a/apps/about/migrations/0005_alter_ally_options.py b/apps/about/migrations/0005_alter_ally_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.25 on 2025-02-17 08:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('about', '0004_auto_20220510_2236'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ally',
+            options={'ordering': ['name'], 'verbose_name': 'Aliado', 'verbose_name_plural': 'Aliados'},
+        ),
+    ]
diff --git a/apps/about/models.py b/apps/about/models.py
@@ -16,6 +16,8 @@ def __str__(self):
 
     class Meta:
         ordering = ['name']
+        verbose_name = 'Aliado'
+        verbose_name_plural = 'Aliados'
 
 
 class FAQItem(models.Model):
diff --git a/apps/certificates/management/commands/create_certificate.py b/apps/certificates/management/commands/create_certificate.py
@@ -2,8 +2,8 @@
 
 from django.core.management.base import BaseCommand
 
-from certificates.utils import create_certificate
-from tickets.models import Ticket
+from apps.certificates.utils import create_certificate
+from apps.tickets.models import Ticket
 
 
 class Command(BaseCommand):
diff --git a/apps/events/test_tasks.py b/apps/events/test_tasks.py
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # coding=utf-8
 
-import datetime
+from datetime import datetime as DateTime
 import os
 from unittest.mock import Mock
 
@@ -30,7 +30,7 @@ def test_ticket():
         customer_name="Nombre del comprador",
         customer_surname='Apellidos comprador',
         customer_email='euribates@gmail.com',
-        sold_at=datetime.datetime(2018, 10, 11, 22, 44, 00),
+        sold_at=DateTime(2018, 10, 11, 22, 44, 00),
         keycode='18b0b618-7b9e-4857-9f01-39999424ee3f',
         )
     ticket.article = article
diff --git a/apps/homepage/templates/homepage/index.html b/apps/homepage/templates/homepage/index.html
@@ -74,7 +74,7 @@ <h2><a class="event-target" href="{% url 'events:detail_event' slug=event.slug %
         {% endif %}
 
         <h4 class="content blog-message">Para más noticias, pásate por nuestro
-          <a href="https://medium.com/pythoncanarias" target="_blank" class="blog-link">
+          <a href="https://medium.com/pythoncanarias" class="blog-link">
             blog
             <span class="icon">
               <i class="fab fa-medium"></i>
@@ -83,36 +83,49 @@ <h4 class="content blog-message">Para más noticias, pásate por nuestro
         </h4>
 
         <div class="social buttons is-centered">
-          <a href="https://twitter.com/pythoncanarias" target="_blank" class="button is-medium">
+
+          <a href="https://github.com/pythoncanarias/" class="button is-medium">
             <span class="icon">
-              <i class="fab fa-twitter"></i>
+              <i class="fab fa-github"></i>
             </span>
           </a>
-          <a href="https://www.instagram.com/pythoncanarias/" target="_blank" class="button is-medium">
+
+          <a href="https://t.me/joinchat/AJ7pmT-X0xZVPgWDIzGA-A" class="button is-medium">
             <span class="icon">
-              <i class="fab fa-instagram"></i>
+              <i class="fab fa-telegram"></i>
             </span>
           </a>
-          <a href="https://t.me/joinchat/AJ7pmT-X0xZVPgWDIzGA-A" target="_blank" class="button is-medium">
+
+          <a href="https://www.instagram.com/pythoncanarias/" class="button is-medium">
             <span class="icon">
-              <i class="fab fa-telegram"></i>
+              <i class="fab fa-instagram"></i>
             </span>
           </a>
-          <a href="https://www.youtube.com/channel/UCIH5U0UXk-NL1HdFSo__63A" target="_blank" class="button is-medium">
+
+          <a href="https://www.youtube.com/channel/UCIH5U0UXk-NL1HdFSo__63A" class="button is-medium">
             <span class="icon">
               <i class="fab fa-youtube"></i>
             </span>
           </a>
-          <a href="https://www.facebook.com/pythoncanarias/" target="_blank" class="button is-medium">
+
+          <a href="https://www.facebook.com/pythoncanarias/" class="button is-medium">
             <span class="icon">
               <i class="fab fa-facebook"></i>
             </span>
           </a>
-          <a href="mailto:{{ organization.email }}" target="_blank" class="button is-medium">
+
+          <a href="https://twitter.com/pythoncanarias" class="button is-medium">
+            <span class="icon">
+              <i class="fab fa-twitter"></i>
+            </span>
+          </a>
+
+          <a href="mailto:{{ organization.email }}" class="button is-medium">
             <span class="icon">
               <i class="fas fa-envelope-open"></i>
             </span>
           </a>
+
         </div>
 
       </div>
diff --git a/apps/jobs/models.py b/apps/jobs/models.py
@@ -38,16 +38,10 @@
 class ActiveJobOfferManager(models.Manager):
     def get_queryset(self):
         today = datetime.date.today()
-        return (
-            super()
-            .get_queryset()
-            .filter(approved=True)
-            .filter(valid_until__gte=today)
-        )
+        return super().get_queryset().filter(approved=True).filter(valid_until__gte=today)
 
 
 class JobOffer(models.Model):
-
     objects = models.Manager()  # The default manager.
     actives = ActiveJobOfferManager()  # Only the active jobs offer
 
@@ -59,9 +53,7 @@ class Meta:
     employer = models.CharField("Ofertante", max_length=120)
     title = models.CharField("Nombre del puesto", max_length=220)
     description = models.TextField("Texto de la oferta", max_length=2000)
-    salary = models.CharField(
-        "Salario o rango salarial", max_length=80, blank=True
-    )
+    salary = models.CharField("Salario o rango salarial", max_length=80, blank=True)
     contract_type = models.CharField(
         "Tipo de contrato",
         max_length=3,
@@ -107,7 +99,8 @@ def get_full_url(self):
     def save(self, *args, **kwargs):
         already_exists = self.pk is not None
         super().save(*args, **kwargs)
+        ''' tweepy.error.TweepError: [{'message': 'You currently have access to a subset of Twitter API v2 endpoints and limited v1.1 endpoints (e.g. media post, oauth) only. If you need access to this endpoint, you may need a different access level. You can learn more here: https://developer.twitter.com/en/portal/product', 'code': 453}]
         if not already_exists and self.approved:
             t = Twitter()
             msg = f'💼  Oferta de empleo: {self} {self.get_full_url()}'
-            t.post(msg)
+            t.post(msg)'''
diff --git a/apps/learn/templates/learn/index.html b/apps/learn/templates/learn/index.html
@@ -12,9 +12,9 @@ <h1 class="title">Aprende Python</h1>
 
 <p>En esta sección podrás encontrar <strong>recursos de aprendizaje Python</strong>. Están clasificados por etiquetas:</p>
 
-<ul>
+<ul style="display: flex; flex-wrap: wrap">
   {% for label in labels %}
-    <li>
+    <li style="padding: 5px 5px 5px 0px">
         <a class="label"
            style="background-color: #{{ label.color }}; color: #{{ label.foreground_color }}"
            href="{% url "learn:resources_by_label" label=label %}">
diff --git a/deploy.sh b/deploy.sh
@@ -8,5 +8,5 @@ npm install --no-save
 gulp
 python manage.py migrate
 python manage.py collectstatic --noinput --clear
-supervisorctl restart web
 supervisorctl restart rq
+supervisorctl restart web
diff --git a/justfile b/justfile
@@ -2,7 +2,7 @@
 check:
     python manage.py check
     flake8 --count **/*.py
-    vulture .
+    # vulture . --exclude node_modules/
 
 
 # Borrar ficheros temporales y espurios
@@ -42,3 +42,15 @@ static:
 # [Re]crear el fichero ctags
 tags:
     ctags -R --exclude=@ctags-exclude-names.txt .
+
+# Ejecutar los test pasados como paræmetro (Empezará por el último que haya fallado)
+test *args='.':
+    python3 -m pytest --failed-first -vv -x --log-cli-level=INFO --doctest-modules -m "not slow" {{ args }}
+
+# Muestra información del Harware / S.O. / Python / Django
+info:
+    @echo "This is an {{arch()}} machine"
+    @echo "OS: {{os()}} / {{os_family()}}"
+    python3 -V
+    python3 -c "import django; print(django.__version__)"
+    uptime
diff --git a/main/urls.py b/main/urls.py
@@ -5,11 +5,11 @@
 
 from apps.homepage import views
 
-admin_url = 'admin' if settings.DEBUG else 'python-canarias-admin-zone'
+admin_url = 'admin/' if settings.DEBUG else 'python-canarias-admin-zone/'
 
 urlpatterns = [
     path('', views.homepage, name='homepage'),
-    path(f'{admin_url}/', admin.site.urls),
+    path(admin_url, admin.site.urls),
     path('api/', include('apps.api.urls', namespace='api')),
     path('django-rq/', include('django_rq.urls')),
     path('events/', include('apps.events.urls', namespace='events')),
diff --git a/pytest.ini b/pytest.ini
@@ -1,2 +1,8 @@
 [pytest]
+python_files = tests.py test_*.py
 DJANGO_SETTINGS_MODULE = main.settings
+
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    wip: Work in progress
+
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 colorama==0.4.4
 MarkupPy==1.14
-pyyaml==5.4
-django==3.2.13
+pyyaml==6.0.2
+django==3.2.25
 django-colorfield==0.1.15
 django-import-export==2.7.1
 django-leaflet==0.28.0
@@ -10,19 +10,19 @@ jinja2==2.11.3
 markdown2==2.4.0
 odfpy==1.4.1
 openpyxl==3.0.3
-pillow==8.3.2
+pillow==10.4.0
 prettyconf==2.1.0
-psycopg2-binary==2.7.5
+psycopg2-binary==2.9.9
 pyqrcode==1.2.1
 qr==0.6.0
-redis==4.4.4
-reportlab==3.5.32
+redis==5.0.8
+reportlab==4.2.2
 rq==1.8.1
 sendgrid==5.6.0
-stripe==2.41.0
+stripe==10.6.0
 tabulate==0.8.9
-uWSGI==2.0.18
+uWSGI==2.0.26
 xlrd==1.2.0
 xlwt==1.3.0
 tweepy==3.10.0
-django_redis==5.0.0
+django_redis==5.4.0
diff --git a/run-notices.sh b/run-notices.sh
@@ -2,6 +2,6 @@
 
 # Dispatch notices from Python Canarias
 
-source ~/.virtualenvs/web/bin/activate
+source ~/.pyenv/versions/pycanweb/bin/activate
 cd $(dirname $0)
 exec python manage.py notices run
diff --git a/run-rq.sh b/run-rq.sh
@@ -3,6 +3,6 @@
 # Launch worker for Redis Queue
 # https://python-rq.org/
 
-source ~/.virtualenvs/web/bin/activate
+source ~/.pyenv/versions/pycanweb/bin/activate
 cd $(dirname $0)
 exec python manage.py rqworker default low
diff --git a/run.sh b/run.sh
@@ -3,6 +3,6 @@
 # Launch Django main entrypoint through UWSGI application server
 # https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/uwsgi/
 
-source ~/.virtualenvs/web/bin/activate
+source ~/.pyenv/versions/pycanweb/bin/activate
 cd $(dirname $0)
 exec uwsgi --ini uwsgi.ini
