Merge branch 'master' into fix/release-webhook-commit-hash

Author: canihavesomecoffee

.github/workflows/main.yml

@@ -15,8 +15,16 @@ jobs:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.10', '3.12', '3.13', '3.14']
+        include:
+          - python-version: '3.13'
+            experimental: true
+          - python-version: '3.14'
+            experimental: true
+
+    continue-on-error: ${{ matrix.experimental || false }}
 
     steps:
     - uses: actions/checkout@v3
@@ -27,7 +35,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install libvirt-dev
+        sudo apt-get install libvirt-dev libxml2-dev libxslt-dev
         python -m pip install --upgrade pip
         if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
@@ -50,7 +58,7 @@ jobs:
       run: |
         nose2
     - name: Upload to codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457  # v3
       with:
         flags: unittests
         name: sample-platform

database.py

@@ -107,7 +107,9 @@ def __init__(self, classname: str, bases: Union[Tuple[Type[DeclEnum]], Tuple[Typ
         self._reg: Dict
         self._reg = reg = self._reg.copy()
         for k, v in dict_.items():
-            if isinstance(v, tuple):
+            # Skip dunder attributes (Python 3.13+ adds __static_attributes__ tuple)
+            # and validate tuple has exactly 2 elements (value, description)
+            if isinstance(v, tuple) and not k.startswith('_') and len(v) == 2:
                 sym = reg[v[0]] = EnumSymbol(self, k, *v)
                 setattr(self, k, sym)
         return type.__init__(self, classname, bases, dict_)

manage.py

@@ -1,41 +1,34 @@
 #!/usr/local/bin/python3
-"""Root module to manage flask script commands."""
-from flask_script import Command, Manager
+"""Root module to manage flask CLI commands."""
+import click
 
 from exceptions import CCExtractorEndedWithNonZero, MissingPathToCCExtractor
 from mod_regression.update_regression import update_expected_results
 from run import app
 
-manager = Manager(app)
 
-
-@manager.add_command
-class UpdateResults(Command):
+@app.cli.command('update')
+@click.argument('path_to_ccex')
+def update_results(path_to_ccex):
     """
     Update results for the present samples with new ccextractor version.
 
-    Pass path to CCExtractor binary as the first argument. Example, `python manage.py update /path/to/ccextractor`
+    Pass path to CCExtractor binary as the argument.
+    Example: flask update /path/to/ccextractor
     """
+    if not path_to_ccex:
+        click.echo('path to ccextractor is missing')
+        raise MissingPathToCCExtractor
 
-    name = 'update'
-    capture_all_args = True
-
-    def run(self, remaining):
-        """Driver function for update command."""
-        if len(remaining) == 0:
-            print('path to ccextractor is missing')
-            raise MissingPathToCCExtractor
-
-        path_to_ccex = remaining[0]
-        print(f'path to ccextractor: {path_to_ccex}')
+    click.echo(f'path to ccextractor: {path_to_ccex}')
 
-        if not update_expected_results(path_to_ccex):
-            print('update function errored')
-            raise CCExtractorEndedWithNonZero
+    if not update_expected_results(path_to_ccex):
+        click.echo('update function errored')
+        raise CCExtractorEndedWithNonZero
 
-        print('update function finished')
-        return 0
+    click.echo('update function finished')
+    return 0
 
 
 if __name__ == '__main__':
-    manager.run()
+    app.cli()

migrations/env.py

@@ -22,9 +22,9 @@
 fileConfig(config.config_file_name)
 logger = logging.getLogger('alembic.env')
 
-config.set_main_option(
-    'sqlalchemy.url', current_app.config.get(
-        'SQLALCHEMY_DATABASE_URI').replace('%', '%%'))
+db_uri = current_app.config.get('SQLALCHEMY_DATABASE_URI')
+if db_uri is not None:
+    config.set_main_option('sqlalchemy.url', db_uri.replace('%', '%%'))
 target_metadata = current_app.extensions['migrate'].db.metadata
 
 # other values from the config, defined by the needs of env.py,

mod_auth/controllers.py

@@ -469,7 +469,7 @@ def manage():
         if user_to_update.email != form.email.data:
             old_email = user_to_update.email
             user_to_update.email = form.email.data
-        if len(form.new_password.data) >= 10:
+        if len(form.new_password.data or "") >= 10:
             password = True
             user_to_update.password = User.generate_hash(form.new_password.data)
         if user_to_update.name != form.name.data:

mod_auth/forms.py

@@ -4,9 +4,8 @@
 from typing import Any, Callable, Optional, Type
 
 from flask_wtf import FlaskForm
-from wtforms import PasswordField, SelectField, StringField, SubmitField
-from wtforms.fields.html5 import EmailField
-from wtforms.fields.simple import PasswordField
+from wtforms import (EmailField, PasswordField, SelectField, StringField,
+                     SubmitField)
 from wtforms.validators import DataRequired, Email, ValidationError
 
 import mod_auth.models
@@ -39,7 +38,7 @@ def valid_password(form: CompleteSignupForm, field: PasswordField) -> None:
     from run import config
     min_pwd_len = int(config['MIN_PWD_LEN'])
     max_pwd_len = int(config['MAX_PWD_LEN'])
-    pass_size = len(field.data)
+    pass_size = len(field.data or "")
     if pass_size == 0:
         raise ValidationError('new password cannot be empty')
     if pass_size < min_pwd_len or pass_size > max_pwd_len:
@@ -59,7 +58,7 @@ def email_not_in_use(has_user_field: bool = False) -> Callable:
     def _email_not_in_use(form, field):
         user_id = -1 if not has_user_field else form.user.id
         user = User.query.filter(User.email == field.data).first()
-        if user is not None and user.id != user_id and len(field.data) > 0:
+        if user is not None and user.id != user_id and len(field.data or "") > 0:
             raise ValidationError('This address is already in use')
 
     return _email_not_in_use
@@ -165,7 +164,7 @@ def validate_new_password(form, field) -> None:
         :param field: The data value for the 'password' entered by User
         :type field : PasswordField
         """
-        if len(field.data) == 0 and len(form.new_password_repeat.data) == 0:
+        if len(field.data or "") == 0 and len(form.new_password_repeat.data or "") == 0:
             return
 
         valid_password(form, field)
@@ -181,7 +180,7 @@ def validate_new_password_repeat(form, field) -> None:
         :type field : PasswordField
         """
         if form.email is not None:
-            if len(field.data) == 0 and len(form.new_password.data) == 0:
+            if len(field.data or "") == 0 and len(form.new_password.data or "") == 0:
                 return
 
         if field.data != form.new_password.data:

mod_ci/controllers.py

@@ -16,7 +16,8 @@
 import requests
 from flask import (Blueprint, abort, flash, g, jsonify, redirect, request,
                    url_for)
-from github import Commit, Github, GithubException, GithubObject, Repository
+from github import (Auth, Commit, Github, GithubException, GithubObject,
+                    Repository)
 from google.oauth2 import service_account
 from lxml import etree
 from markdown2 import markdown
@@ -146,7 +147,7 @@ def start_platforms(repository, delay=None, platform=None) -> None:
 
     with app.app_context():
         from flask import current_app
-        app = current_app._get_current_object()
+        app = current_app._get_current_object()  # type: ignore[attr-defined]
 
         # Create a database session
         db = create_session(config.get('DATABASE_URI', ''))
@@ -792,7 +793,7 @@ def schedule_test(gh_commit: Commit.Commit) -> None:
 
 
 def update_status_on_github(gh_commit: Commit.Commit, state, description, context,
-                            target_url=GithubObject.NotSet):  # type: ignore
+                            target_url=GithubObject.NotSet):
     """
     Update status on GitHub.
 
@@ -1005,7 +1006,11 @@ def start_ci():
             g.log.warning(f'CI payload is empty')
             abort(abort_code)
 
-        gh = Github(g.github['bot_token'])
+        if not g.github['bot_token']:
+            g.log.error('GitHub token not configured, cannot process webhook')
+            return json.dumps({'msg': 'GitHub token not configured'}), 500
+
+        gh = Github(auth=Auth.Token(g.github['bot_token']))
         repository = gh.get_repo(f"{g.github['repository_owner']}/{g.github['repository']}")
 
         if event == "push":
@@ -1413,7 +1418,11 @@ def progress_type_request(log, test, test_id, request) -> bool:
     g.db.add(progress)
     g.db.commit()
 
-    gh = Github(g.github['bot_token'])
+    if not g.github['bot_token']:
+        log.error('GitHub token not configured, cannot update status on GitHub')
+        return True
+
+    gh = Github(auth=Auth.Token(g.github['bot_token']))
     repository = gh.get_repo(f"{g.github['repository_owner']}/{g.github['repository']}")
     # Store the test commit for testing in case of commit
     if status == TestStatus.completed and is_main_repo(test.fork.github):
@@ -1786,8 +1795,11 @@ def comment_pr(test: Test) -> str:
     template = app.jinja_env.get_or_select_template('ci/pr_comment.txt')
     message = template.render(comment_info=comment_info, test_id=test_id, platform=platform)
     log.debug(f"GitHub PR Comment Message Created for Test_id: {test_id}")
+    if not g.github['bot_token']:
+        log.error(f"GitHub token not configured, cannot post PR comment for Test_id: {test_id}")
+        return Status.FAILURE
     try:
-        gh = Github(g.github['bot_token'])
+        gh = Github(auth=Auth.Token(g.github['bot_token']))
         repository = gh.get_repo(f"{g.github['repository_owner']}/{g.github['repository']}")
         # Pull requests are just issues with code, so GitHub considers PR comments in issues
         pull_request = repository.get_pull(number=test.pr_nr)
@@ -1858,9 +1870,13 @@ def blocked_users():
         g.db.commit()
         flash('User blocked successfully.')
 
+        if not g.github['bot_token']:
+            g.log.error('GitHub token not configured, cannot check blocked user PRs')
+            return redirect(url_for('.blocked_users'))
+
         try:
             # Remove any queued pull request from blocked user
-            gh = Github(g.github['bot_token'])
+            gh = Github(auth=Auth.Token(g.github['bot_token']))
             repository = gh.get_repo(f"{g.github['repository_owner']}/{g.github['repository']}")
             # Getting all pull requests by blocked user on the repo
             pulls = repository.get_pulls(state='open')

mod_ci/cron.py

@@ -11,14 +11,18 @@
 def cron(testing=False):
     """Script to run from cron for Sampleplatform."""
     from flask import current_app
-    from github import Github
+    from github import Auth, Github
 
     from database import create_session
     from mod_ci.controllers import TestPlatform, gcp_instance, start_platforms
     from run import config, log
 
     log.info('Run the cron for kicking off CI platform(s).')
-    gh = Github(config['GITHUB_TOKEN'])
+    github_token = config['GITHUB_TOKEN']
+    if not github_token:
+        log.error('GITHUB_TOKEN not configured, cannot run CI cron')
+        return
+    gh = Github(auth=Auth.Token(github_token))
     repository = gh.get_repo(f"{config['GITHUB_OWNER']}/{config['GITHUB_REPOSITORY']}")
 
     if testing is True:

mod_customized/controllers.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timedelta
 
 from flask import Blueprint, g, redirect, request, url_for
-from github import Github, GithubException
+from github import Auth, Github, GithubException
 from sqlalchemy import and_
 
 from decorators import template_renderer
@@ -47,8 +47,8 @@ def index():
     fork_test_form = TestForkForm(request.form)
     username = fetch_username_from_token()
     commit_options = False
-    if username is not None:
-        gh = Github(g.github['bot_token'])
+    if username is not None and g.github['bot_token']:
+        gh = Github(auth=Auth.Token(g.github['bot_token']))
         repository = gh.get_repo(f"{username}/{g.github['repository']}")
         # Only commits since last month
         last_month = datetime.now() - timedelta(days=30)
@@ -78,6 +78,8 @@ def index():
                     fork_test_form.commit_hash.errors.append('Error contacting GitHub')
                 else:
                     fork_test_form.commit_hash.errors.append('Wrong Commit Hash')
+    elif username is not None:
+        g.log.error('GitHub token not configured, cannot fetch commits')
 
     populated_categories = g.db.query(regressionTestLinkTable.c.category_id).subquery()
     categories = Category.query.filter(Category.id.in_(populated_categories)).order_by(Category.name.asc()).all()

mod_test/models.py

@@ -295,7 +295,7 @@ def __init__(self, test_id, status, message, timestamp=None) -> None:
         tz = get_localzone()
 
         if timestamp is None:
-            timestamp = tz.localize(datetime.datetime.now())
+            timestamp = datetime.datetime.now(tz)
             timestamp = timestamp.astimezone(pytz.UTC)
 
         if timestamp.tzinfo is None: