Merge branch 'master' into dependabot/pip/django-3.2.20

Author: eduzen

.github/workflows/test.yaml

@@ -28,33 +28,50 @@ jobs:
       matrix:
         python-version: [3.9]
     env:
-      DJANGO: 3.0 
+      DJANGO: 3.0
       SECRET_KEY: supersecret
-      DB_PORT: 5432 
+      DB_PORT: 5432
       POSTGRES_HOST: localhost
       POSTGRES_PASSWORD: somepassword
       POSTGRES_USER: postgres
       POSTGRES_DB: testing_db
       DJANGO_SETTINGS_MODULE: pyarweb.settings.development
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Install system libraries
         run: |
           sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/dev_requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r dev_requirements.txt
-      - name: Lint with flake8
+
+      - name: Check Code Style
+        uses: pre-commit/[email protected]
+
+      - name: Check for Django migrations
         run: |
-          flake8
+          python manage.py makemigrations --dry-run --check
+
       - name: Run migrations
         run: |
-          python manage.py migrate          
+          python manage.py migrate
+
       - name: Run tests
         run: |
           pytest -v

.github/workflows/upload_to_dockerhub.yaml

@@ -20,19 +20,19 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: my-docker-hub-namespace/my-docker-hub-repository
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:

.pre-commit-config.yaml

@@ -0,0 +1,27 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-merge-conflict
+      - id: debug-statements
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.1.1
+    hooks:
+      - id: flake8
+        args:
+          - '--config=.flake8'
+          - '--exclude=.venv,**/migrations/*.py'
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.1
+    hooks:
+      - id: pyupgrade
+        args: [--py39-plus]
+
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: "1.22.2"
+    hooks:
+    -   id: django-upgrade
+        args: [--target-version, "3.2"]

Dockerfile

@@ -1,6 +1,7 @@
 FROM python:3.9
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /code:$PYTHONPATH
+RUN apt-get update && apt-get -y install flite=2.2-5
 RUN mkdir /code
 WORKDIR /code
 COPY dev_requirements.txt /code

INSTALLATION.md

@@ -1,3 +1,3 @@
-## Guia de instalación 
+## Guia de instalación
 
 Seguí los pasos en nuestra wiki: https://github.com/PyAr/pyarweb/wiki/Instalacion-con-Docker

Makefile

@@ -28,6 +28,9 @@ only_test:
 pep8:
 	docker-compose run --rm web flake8
 
+format:
+	pre-commit run -a
+
 test: pep8 only_test
 
 dockershell:

README.md

@@ -20,6 +20,13 @@ instrucciones generales en [esta página de la wiki](https://github.com/PyAr/pya
 
 podés ver las instrucciones en [esta página de la wiki](https://github.com/PyAr/pyarweb/wiki/Instalacion-con-Docker)
 
+## Lint & Format
+
+Para correr el linter y el formateador de código, podés correr:
+
+```bash
+make format
+```
 
 ## Más info
 

community/templates/_tags_filtering_form.html

@@ -13,8 +13,8 @@
                 </div>
                 <div class="ma-5" style="margin-top:15px;">
                   <label>
-                    <input name="active" type="hidden" value="{{ active|yesno:'false,true' }}">
-                    <input id="show-active" type="checkbox" {% if not active %}checked{% endif %} />
+                    <input name="active" type="hidden" value="{{ active|yesno:'true,false' }}">
+                    <input id="show-active" type="checkbox" {% if active %}checked{% endif %} />
                     {% trans 'Mostrar solo ofertas activas' %}
                   </label>
                 </div>
@@ -25,7 +25,7 @@ <h4 class="list-group-item-heading">{% trans 'Filtrar por etiqueta' %} <button t
         </header>
         <article class="list-group-item" style="padding:30px;">
             <div class="row">
-                    {% for tag in tags %}
+                    {% for tag in usefultags %}
                     <select name="tag_{{ tag.slug }}" id="tag_{{ tag.slug }}" class="hidden">
                         <option value=""></option>
                         <option value="1" {% if tag.slug in included %}selected{% endif %}></option>

community/templates/account/custom_captcha.html

@@ -0,0 +1,23 @@
+{% load i18n %}
+{% spaceless %}
+<div class="form-group">
+  <label class="control-label">{{ label }}</label>
+  <div class="form-group">
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        <img src="{{ image }}" alt="captcha" class="captcha" />
+        {% if audio %}
+        <audio
+            title="{% trans "Play CAPTCHA as audio file" %}"
+            src="{{ audio }}"
+            alt="captcha audio"
+            controls
+            style="display: block; padding-bottom: 1rem;"
+        >
+        {% endif %}
+      </div>
+      {% include "django/forms/widgets/multiwidget.html" %}
+    </div>
+  </div>
+</div>
+{% endspaceless %}

community/templates/base.html

@@ -28,7 +28,7 @@
         <link rel="icon" href="{% static 'img/icons/pyar.ico' %}" type="image/ico">
 
         {% block extra_head %}{% endblock %}
-        
+
         {% if GOOGLE_TRACKING_ID %}
             <!-- Global site tag (gtag.js) - Google Analytics -->
             <script async src="https://www.googletagmanager.com/gtag/js?id=UA-169755710-1"></script>
@@ -48,9 +48,9 @@
                 background-image: url({% static "img/pyar-footer.png" %});
             }
 
-            #footer li.usla {
-                background-image: url({% static "img/usla-footer.png" %});
-                padding-right: 80px;
+            #footer li.azure {
+                background-image: url({% static "img/azure-footer.png" %});
+                padding-right: 50px;
             }
 
             #footer li.python {