Merge branch 'main' into fix-gulp-issue

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}")

pyproject.toml

@@ -0,0 +1,98 @@
+[build-system]
+requires = ["setuptools>=64", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "lemur"
+dynamic = ["version", "readme", "dependencies", "optional-dependencies"]
+description = "Certificate management and orchestration service"
+authors = [
+    {name = "The Lemur developers", email = "[email protected]"}
+]
+license = {text = "Apache License, Version 2.0"}
+classifiers = [
+    "Framework :: Flask",
+    "Intended Audience :: Developers",
+    "Intended Audience :: System Administrators",
+    "Operating System :: OS Independent",
+    "Topic :: Software Development",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Natural Language :: English",
+    "License :: OSI Approved :: Apache Software License"
+]
+requires-python = ">=3.10"
+
+
+[project.urls]
+homepage = "https://github.com/Netflix/lemur"
+repository = "https://github.com/Netflix/lemur"
+
+[project.scripts]
+lemur = "lemur.manage:main"
+
+[project.entry-points."lemur.plugins"]
+verisign_issuer = "lemur.plugins.lemur_verisign.plugin:VerisignIssuerPlugin"
+acme_issuer = "lemur.plugins.lemur_acme.plugin:ACMEIssuerPlugin"
+acme_http_issuer = "lemur.plugins.lemur_acme.plugin:ACMEHttpIssuerPlugin"
+aws_destination = "lemur.plugins.lemur_aws.plugin:AWSDestinationPlugin"
+aws_acm_destination = "lemur.plugins.lemur_aws.plugin:ACMDestinationPlugin"
+aws_source = "lemur.plugins.lemur_aws.plugin:AWSSourcePlugin"
+aws_acm_source = "lemur.plugins.lemur_aws.plugin:AWSACMSourcePlugin"
+aws_s3 = "lemur.plugins.lemur_aws.plugin:S3DestinationPlugin"
+aws_sns = "lemur.plugins.lemur_aws.plugin:SNSNotificationPlugin"
+email_notification = "lemur.plugins.lemur_email.plugin:EmailNotificationPlugin"
+slack_notification = "lemur.plugins.lemur_slack.plugin:SlackNotificationPlugin"
+java_truststore_export = "lemur.plugins.lemur_jks.plugin:JavaTruststoreExportPlugin"
+java_keystore_export = "lemur.plugins.lemur_jks.plugin:JavaKeystoreExportPlugin"
+openssl_export = "lemur.plugins.lemur_openssl.plugin:OpenSSLExportPlugin"
+atlas_metric = "lemur.plugins.lemur_atlas.plugin:AtlasMetricPlugin"
+atlas_metric_redis = "lemur.plugins.lemur_atlas_redis.plugin:AtlasMetricRedisPlugin"
+kubernetes_destination = "lemur.plugins.lemur_kubernetes.plugin:KubernetesDestinationPlugin"
+cryptography_issuer = "lemur.plugins.lemur_cryptography.plugin:CryptographyIssuerPlugin"
+cfssl_issuer = "lemur.plugins.lemur_cfssl.plugin:CfsslIssuerPlugin"
+digicert_issuer = "lemur.plugins.lemur_digicert.plugin:DigiCertIssuerPlugin"
+digicert_source = "lemur.plugins.lemur_digicert.plugin:DigiCertSourcePlugin"
+digicert_cis_issuer = "lemur.plugins.lemur_digicert.plugin:DigiCertCISIssuerPlugin"
+digicert_cis_source = "lemur.plugins.lemur_digicert.plugin:DigiCertCISSourcePlugin"
+csr_export = "lemur.plugins.lemur_csr.plugin:CSRExportPlugin"
+sftp_destination = "lemur.plugins.lemur_sftp.plugin:SFTPDestinationPlugin"
+vault_source = "lemur.plugins.lemur_vault_dest.plugin:VaultSourcePlugin"
+vault_desination = "lemur.plugins.lemur_vault_dest.plugin:VaultDestinationPlugin"
+adcs_issuer = "lemur.plugins.lemur_adcs.plugin:ADCSIssuerPlugin"
+adcs_source = "lemur.plugins.lemur_adcs.plugin:ADCSSourcePlugin"
+entrust_issuer = "lemur.plugins.lemur_entrust.plugin:EntrustIssuerPlugin"
+entrust_source = "lemur.plugins.lemur_entrust.plugin:EntrustSourcePlugin"
+azure_destination = "lemur.plugins.lemur_azure_dest.plugin:AzureDestinationPlugin"
+google_ca_issuer = "lemur.plugins.lemur_google_ca.plugin:GoogleCaIssuerPlugin"
+
+[tool.setuptools]
+include-package-data = true
+zip-safe = false
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["lemur*"]
+
+[tool.setuptools.dynamic]
+version = {attr = "lemur.__about__.__version__"}
+readme = {file = "README.rst"}
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies.tests = {file = ["requirements-tests.txt"]}
+optional-dependencies.docs = {file = ["requirements-docs.txt"]}
+optional-dependencies.dev = {file = ["requirements-dev.txt"]}
+
+[tool.pytest]
+python_files = "test*.py"
+addopts = "--tb=native -p no:doctest"
+norecursedirs = "bin dist docs htmlcov script hooks node_modules .* {args}"
+
+[tool.flake8]
+ignore = ["F999", "E501", "E128", "E124", "E402", "W503", "E731", "F841", "F405"]
+max-line-length = 100
+exclude = [".tox", ".git", "*/migrations/*", "lemur/static/*", "docs/*"]
+
+[tool.wheel]
+universal = true

requirements-dev.in

@@ -1,6 +1,7 @@
 # Run `make up-reqs` to update pinned dependencies in requirement text files
 
 flake8
+Flake8-pyproject
 pre-commit
 invoke
 twine

requirements-dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --no-emit-index-url --output-file=requirements-dev.txt requirements-dev.in
@@ -50,7 +50,7 @@ aws-xray-sdk==2.13.0
     # via
     #   -r requirements-tests.txt
     #   moto
-backports-tarfile==1.0.0
+backports-tarfile==1.2.0
     # via jaraco-context
 bandit==1.8.6
     # via -r requirements-tests.txt
@@ -158,7 +158,6 @@ cryptography==45.0.6
     #   pyspnego
     #   python-jose
     #   requests-ntlm
-    #   secretstorage
     #   sshpubkeys
     #   types-paramiko
     #   types-pyopenssl
@@ -167,7 +166,7 @@ deprecated==1.2.14
     # via
     #   -r requirements-tests.txt
     #   limits
-distlib==0.3.8
+distlib==0.4.0
     # via virtualenv
 distro==1.9.0
     # via
@@ -183,7 +182,7 @@ docker==7.0.0
     # via
     #   -r requirements-tests.txt
     #   moto
-docutils==0.21.2
+docutils==0.22
     # via readme-renderer
 dyn==1.8.6
     # via -r requirements-tests.txt
@@ -205,9 +204,13 @@ faker==37.6.0
     #   factory-boy
 fakeredis==2.31.0
     # via -r requirements-tests.txt
-filelock==3.13.3
+filelock==3.19.1
     # via virtualenv
 flake8==7.1.2
+    # via
+    #   -r requirements-dev.in
+    #   flake8-pyproject
+flake8-pyproject==1.2.3
     # via -r requirements-dev.in
 flask==2.3.3
     # via
@@ -287,7 +290,7 @@ hvac==2.3.0
     # via -r requirements-tests.txt
 id==1.5.0
     # via twine
-identify==2.5.35
+identify==2.6.14
     # via pre-commit
 idna==3.7
     # via
@@ -296,10 +299,7 @@ idna==3.7
 importlib-metadata==7.1.0
     # via
     #   -r requirements-tests.txt
-    #   certbot
-    #   flask
     #   keyring
-    #   twine
 importlib-resources==6.4.0
     # via
     #   -r requirements-tests.txt
@@ -321,18 +321,14 @@ itsdangerous==2.2.0
     #   flask
 jaraco-classes==3.4.0
     # via keyring
-jaraco-context==5.3.0
+jaraco-context==6.0.1
     # via keyring
-jaraco-functools==4.0.0
+jaraco-functools==4.3.0
     # via keyring
 javaobj-py3==0.4.4
     # via
     #   -r requirements-tests.txt
     #   pyjks
-jeepney==0.8.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.3
     # via
     #   -r requirements-tests.txt
@@ -392,7 +388,7 @@ junit-xml==1.9
     # via
     #   -r requirements-tests.txt
     #   cfn-lint
-keyring==25.1.0
+keyring==25.6.0
     # via twine
 kombu==5.3.6
     # via
@@ -434,7 +430,7 @@ mdurl==0.1.2
     # via
     #   -r requirements-tests.txt
     #   markdown-it-py
-more-itertools==10.2.0
+more-itertools==10.8.0
     # via
     #   jaraco-classes
     #   jaraco-functools
@@ -461,7 +457,7 @@ networkx==3.2.1
     # via
     #   -r requirements-tests.txt
     #   cfn-lint
-nh3==0.2.17
+nh3==0.3.0
     # via readme-renderer
 nodeenv==1.9.1
     # via
@@ -662,7 +658,7 @@ pyyaml==6.0.2
     #   moto
     #   pre-commit
     #   responses
-readme-renderer==43.0
+readme-renderer==44.0
     # via twine
 redis==5.3.1
     # via
@@ -740,8 +736,6 @@ sarif-om==1.0.4
     # via
     #   -r requirements-tests.txt
     #   cfn-lint
-secretstorage==3.3.3
-    # via keyring
 sentry-sdk==2.35.1
     # via -r requirements-tests.txt
 six==1.17.0
@@ -783,9 +777,10 @@ tomli==2.0.1
     # via
     #   -r requirements-tests.txt
     #   black
+    #   flake8-pyproject
     #   mypy
     #   pytest
-twine==6.1.0
+twine==6.2.0
     # via -r requirements-dev.in
 twofish==0.3.0
     # via
@@ -837,13 +832,11 @@ typing-extensions==4.11.0
     #   black
     #   fakeredis
     #   flask-limiter
-    #   kombu
     #   limits
     #   mypy
     #   pydantic
     #   pydantic-core
     #   pyopenssl
-    #   python-json-logger
 tzdata==2024.1
     # via
     #   -r requirements-tests.txt
@@ -866,7 +859,7 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.26.6
+virtualenv==20.33.1
     # via pre-commit
 wcwidth==0.2.13
     # via
@@ -892,7 +885,6 @@ zipp==3.19.1
     # via
     #   -r requirements-tests.txt
     #   importlib-metadata
-    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools