Merge branch 'main' into dependabot/pip/botocore-1.40.30

Author: jmcrawford45

.github/workflows/ci.yml

@@ -49,12 +49,12 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
       - name: Set up Node.js 16
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 16
       - name: Install dependencies

.github/workflows/lemur-publish-release-pypi.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
       - name: Autobump version

.readthedocs.yml

@@ -20,11 +20,13 @@ build:
       python: "3.11"
    jobs:
       pre_install:
+         - grep -v "python-ldap" requirements.txt > tempreqs && mv tempreqs requirements.txt
          - grep -v "python-ldap" requirements-docs.txt > tempreqs && mv tempreqs requirements-docs.txt
 
 
 python:
    install:
-   - requirements: requirements-docs.txt
-   - method: setuptools
+   - method: pip
      path: .
+     extra_requirements:
+       - docs

MANIFEST.in

@@ -1,4 +1,4 @@
-include setup.py version.py package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS requirements*.txt
+include pyproject.toml package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS requirements*.txt
 recursive-include lemur/plugins/lemur_email/templates *
 recursive-include lemur/static *
 global-exclude *~

build_backend.py

@@ -0,0 +1,55 @@
+"""
+Custom build backend for Lemur that handles static asset building.
+This replaces the custom commands from the old setup.py.
+"""
+import os
+import subprocess
+import logging
+from setuptools import build_meta as _orig
+from setuptools.build_meta import *
+
+
+def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
+    """Build wheel with static assets."""
+    _build_static()
+    return _orig.build_wheel(wheel_directory, config_settings, metadata_directory)
+
+
+def build_sdist(sdist_directory, config_settings=None):
+    """Build source distribution with static assets."""
+    _build_static()
+    return _orig.build_sdist(sdist_directory, config_settings)
+
+
+def _build_static():
+    """Build static assets using npm and gulp."""
+    root = os.path.dirname(os.path.abspath(__file__))
+    
+    # Check if static assets already exist
+    if os.path.exists(os.path.join(root, 'lemur/static/dist')):
+        logging.info("Static assets already exist, skipping build")
+        return
+    
+    logging.info(f"Building static assets in {root}")
+    
+    try:
+        # Run npm install
+        logging.info("Running npm install --quiet")
+        subprocess.check_call(['npm', 'install', '--quiet'], cwd=root)
+        
+        # Run gulp build
+        logging.info("Running gulp build")
+        subprocess.check_call([
+            os.path.join(root, 'node_modules', '.bin', 'gulp'), 'build'
+        ], cwd=root)
+        
+        # Run gulp package  
+        logging.info("Running gulp package")
+        subprocess.check_call([
+            os.path.join(root, 'node_modules', '.bin', 'gulp'), 'package'
+        ], cwd=root)
+        
+    except subprocess.CalledProcessError as e:
+        logging.warning(f"Unable to build static content: {e}")
+    except Exception as e:
+        logging.warning(f"Unexpected error building static content: {e}")

gulp/build.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var gulp = require('gulp'),
-  minifycss = require('gulp-minify-css'),
+  cleanCSS = require('gulp-clean-css'),
   concat = require('gulp-concat'),
   less = require('gulp-less'),
   gulpif = require('gulp-if'),
@@ -127,7 +127,7 @@ gulp.task('dev:styles', function () {
     })))
     .pipe(plumber())
     .pipe(concat('styles.css'))
-    .pipe(minifycss())
+    .pipe(cleanCSS())
     .pipe(autoprefixer('last 1 version'))
     .pipe(gulp.dest('.tmp/styles'))
     .pipe(size());

lemur/factory.py

@@ -258,7 +258,7 @@ def install_plugins(app):
     from lemur.plugins import plugins
     from lemur.plugins.base import register
 
-    for ep in entry_points().get("lemur.plugins", []):
+    for ep in entry_points(group="lemur.plugins"):
         try:
             plugin = ep.load()
         except Exception:

lemur/plugins/base/v1.py

@@ -45,7 +45,7 @@ class IPlugin(local):
     title: Optional[str] = None
     slug: Optional[str] = None
     description: Optional[str] = None
-    version = None
+    version: Optional[str] = None
     author: Optional[str] = None
     author_url: Optional[str] = None
     resource_links = ()

lemur/plugins/lemur_acme/__init__.py

@@ -1,4 +1,5 @@
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"

lemur/plugins/lemur_adcs/__init__.py

@@ -1,5 +1,6 @@
 """Set the version information."""
 try:
-    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+    from importlib.metadata import version
+    VERSION = version(__name__)
 except Exception as e:
     VERSION = "unknown"