Fixed merge issue with requirements. The git link appears broken, using pypi instead

Author: Torxed

.gitignore

@@ -12,6 +12,7 @@ collected_static/
 testing/
 env/
 htmlcov
+*.tar.gz
 
 .mypy_cache/
 

README.md

@@ -154,6 +154,6 @@ gpg --sender "User Name <your@mail.address>" --detach-sign sitestatic/netboot/*.
 
 # Production Installation
 
-Arch Linux has an Ansible role for Archweb in their [infrastructure repo](https://git.archlinux.org/infrastructure.git/).
+Arch Linux has an Ansible role for Archweb in their [infrastructure repo](https://gitlab.archlinux.org/archlinux/infrastructure).
 
 vim: set syntax=markdown et:

devel/forms.py

@@ -7,6 +7,7 @@
 from django.contrib.sites.models import Site
 from django.core.mail import send_mail
 from django.template import loader
+from django.forms.widgets import EmailInput, NumberInput, URLInput
 
 from .models import UserProfile
 
@@ -41,6 +42,12 @@ def clean_pgp_key(self):
     class Meta:
         model = UserProfile
         exclude = ('allowed_repos', 'user', 'repos_auth_token')
+        widgets = {
+            'yob': NumberInput(attrs={'min': 1950, 'max': 2500}),
+            'public_email': EmailInput(),  # HACK: field definition should be fixed
+            'website': URLInput(),
+            'website_rss': URLInput(),
+        }
 
 
 class NewUserForm(forms.ModelForm):

devel/management/commands/pgp_import.py

@@ -8,9 +8,8 @@
 """
 
 from collections import OrderedDict
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
-from pytz import utc
 import subprocess
 
 from django.core.management.base import BaseCommand, CommandError
@@ -50,14 +49,14 @@ def get_date(epoch_string):
     '''Convert a epoch string into a python 'date' object (not datetime).'''
     if not epoch_string:
         return None
-    return datetime.utcfromtimestamp(int(epoch_string)).date()
+    return datetime.fromtimestamp(int(epoch_string), tz=timezone.utc).date()
 
 
 def get_datetime(epoch_string):
     '''Convert a epoch string into a python 'datetime' object.'''
     if not epoch_string:
         return None
-    return datetime.utcfromtimestamp(int(epoch_string)).replace(tzinfo=utc)
+    return datetime.fromtimestamp(int(epoch_string), tz=timezone.utc)
 
 
 def call_gpg(keyring, *args):

devel/management/commands/reporead.py

@@ -21,8 +21,7 @@
 import re
 import xtarfile as tarfile
 import logging
-from datetime import datetime
-from pytz import utc
+from datetime import datetime, timezone
 
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connections, router, transaction
@@ -120,8 +119,7 @@ def populate(self, values):
                 self.ver, self.rel, self.epoch = parse_version(v[0])
             elif k == 'builddate':
                 try:
-                    builddate = datetime.utcfromtimestamp(int(v[0]))
-                    self.builddate = builddate.replace(tzinfo=utc)
+                    self.builddate = datetime.fromtimestamp(int(v[0]), tz=timezone.utc)
                 except ValueError:
                     logger.warning(
                         'Package %s had unparsable build date %s',

devel/migrations/0008_alter_userprofile_repos_auth_token_and_more.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-import pytz
+import zoneinfo
 
 from django.urls import reverse
 from django.db import models
 from django.db.models.signals import pre_save, post_save
 from django.contrib.auth.models import User, Group
 from django_countries.fields import CountryField
+from django.core.validators import MinValueValidator, MaxValueValidator
 
 from .fields import PGPKeyField
 from main.utils import make_choice, set_created_field
@@ -22,7 +23,7 @@ class UserProfile(models.Model):
         help_text="When enabled, send user 'flag out-of-date' notifications")
     time_zone = models.CharField(
         max_length=100,
-        choices=make_choice(pytz.common_timezones),
+        choices=make_choice(sorted(zoneinfo.available_timezones())),  # sort as available_timezones output varies
         default="UTC",
         help_text="Used for developer clock page")
     alias = models.CharField(
@@ -39,7 +40,8 @@ class UserProfile(models.Model):
     website = models.CharField(max_length=200, null=True, blank=True)
     website_rss = models.CharField(max_length=200, null=True, blank=True,
                                    help_text='RSS Feed of your website for planet.archlinux.org')
-    yob = models.IntegerField("Year of birth", null=True, blank=True)
+    yob = models.IntegerField("Year of birth", null=True, blank=True,
+                              validators=[MinValueValidator(1950), MaxValueValidator(2500)])
     country = CountryField(blank=True)
     location = models.CharField(max_length=50, null=True, blank=True)
     languages = models.CharField(max_length=50, null=True, blank=True)

devel/migrations/0009_alter_userprofile_time_zone_alter_userprofile_yob.py

@@ -1,7 +1,6 @@
 from collections import defaultdict
-from datetime import timedelta
+from datetime import timedelta, timezone
 
-import pytz
 from django.db.models import F
 from django.template.defaultfilters import filesizeformat
 from django.db import connection
@@ -171,7 +170,7 @@ def signature_time(packages):
         'arch', 'repo', 'packager').filter(signature_bytes__isnull=False)
     for package in packages:
         sig = package.signature
-        sig_date = sig.creation_time.replace(tzinfo=pytz.utc)
+        sig_date = sig.creation_time.replace(tzinfo=timezone.utc)
         package.sig_date = sig_date.date()
         if sig_date > package.build_date + cutoff:
             filtered.append(package)
@@ -244,11 +243,6 @@ def orphan_dependencies(packages):
     return pkgs
 
 
-def unused_python2_packages(packages):
-    required = Depend.objects.all().values('name')
-    return packages.filter(pkgname__startswith='python2').exclude(pkgname__in=required)
-
-
 REPORT_OLD = DeveloperReport(
     'old', 'Old', 'Packages last built more than two years ago', old)
 
@@ -328,13 +322,6 @@ def unused_python2_packages(packages):
     ['Orphan dependencies'],
     ['orphandeps'])
 
-UNUSED_PYTHON2_PACKAGES = DeveloperReport(
-    'unused-python2',
-    'Unused Python2 packages',
-    'python2 modules which are not used required by any other packages in the repository',
-    unused_python2_packages,
-    personal=False)
-
 
 def available_reports():
     return (REPORT_OLD,
@@ -349,5 +336,4 @@ def available_reports():
             REPORT_SIG_TIME,
             NON_EXISTING_DEPENDENCIES,
             REBUILDERD_PACKAGES,
-            ORPHAN_REBUILDERD_PACKAGES,
-            UNUSED_PYTHON2_PACKAGES)
+            ORPHAN_REBUILDERD_PACKAGES)

devel/models.py

@@ -1,12 +1,11 @@
 import tarfile
 from unittest.mock import patch
-from datetime import datetime
+from datetime import datetime, timezone
 
 
 from django.core.management import call_command
 from django.core.management.base import CommandError
 from django.test import TransactionTestCase
-from django.utils import timezone
 
 
 from main.models import Arch, Package, Repo