diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9c56fc39..62a2893a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -39,7 +39,7 @@ jobs: run: pip install -e . - name: Upload HTML documentation if: matrix.python-version == '3.10' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: html-doc path: docs/_build @@ -52,7 +52,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Download HTML documentation from job 'test' - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: html-doc path: docs/_build diff --git a/MANIFEST.in b/MANIFEST.in index 6ce180fa..b0095265 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,23 +1,17 @@ -graft docs graft src -graft tests +exclude src/mlx/warnings/__version__.py # Include the readme file include README.rst include LICENSE -exclude src/mlx/warnings/__version__.py -recursive-exclude docs _build * -recursive-exclude tests test_out * - -include tox.ini .travis.yml .codeclimate.yml codecov.yml - -global-exclude *.py[cod] __pycache__ *.so *.dylib - -# added by check_manifest.py include NOTICE +include *.md +exclude MANIFEST.in +exclude .gitignore +recursive-exclude .github * +recursive-exclude docs * +recursive-exclude tests * -# added by check_manifest.py -recursive-include ci *.py +exclude tox.ini .travis.yml .codeclimate.yml codecov.yml -# added by check_manifest.py -include *.md +global-exclude *.py[cod] __pycache__ *.so *.dylib diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 7af0d2e0..00000000 --- a/SECURITY.md +++ /dev/null @@ -1,16 +0,0 @@ -# Security Policy - -## Supported Versions - -Currently supported versions are 3.0.0 and 1.3.1 . Please use 3.0.0 as default since 1.3.1 support is no longer planned. - -| Version | Supported | -| ------- | ------------------ | -| 3.0.0 | :white_check_mark: | -| 2.0.x | :x: | -| 1.3.1 | :white_check_mark: | - -## Reporting a Vulnerability - -Please report all vulnerabilities through [GitHub Issue Tracker](https://github.com/melexis/warnings-plugin/issues). -Make sure you include ways to replicate it and, if possible, propose a Pull Request with a potential fix. diff --git a/ci/bootstrap.py b/ci/bootstrap.py deleted file mode 100644 index e5292aa8..00000000 --- a/ci/bootstrap.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, unicode_literals - -import os -import sys -from os.path import abspath -from os.path import dirname -from os.path import exists -from os.path import join - - -if __name__ == "__main__": - base_path = dirname(dirname(abspath(__file__))) - print("Project path: {0}".format(base_path)) - env_path = join(base_path, ".tox", "bootstrap") - if sys.platform == "win32": - bin_path = join(env_path, "Scripts") - else: - bin_path = join(env_path, "bin") - if not exists(env_path): - import subprocess - - print("Making bootstrap env in: {0} ...".format(env_path)) - try: - subprocess.check_call(["virtualenv", env_path]) - except subprocess.CalledProcessError: - subprocess.check_call([sys.executable, "-m", "virtualenv", env_path]) - print("Installing `jinja2` into bootstrap environment...") - subprocess.check_call([join(bin_path, "pip"), "install", "jinja2"]) - activate = join(bin_path, "activate_this.py") - # noinspection PyCompatibility - exec(compile(open(activate, "rb").read(), activate, "exec"), dict(__file__=activate)) - - import jinja2 - - import subprocess - - jinja = jinja2.Environment( - loader=jinja2.FileSystemLoader(join(base_path, "ci", "templates")), - trim_blocks=True, - lstrip_blocks=True, - keep_trailing_newline=True - ) - - tox_environments = [ - line.strip() - # WARNING: 'tox' must be installed globally or in the project's virtualenv - for line in subprocess.check_output(['tox', '--listenvs'], universal_newlines=True).splitlines() - ] - tox_environments = [line for line in tox_environments if line not in ['clean', 'report', 'docs', 'check']] - - for name in os.listdir(join("ci", "templates")): - with open(join(base_path, name), "w") as fh: - fh.write(jinja.get_template(name).render(tox_environments=tox_environments)) - print("Wrote {}".format(name)) - print("DONE.") diff --git a/pyproject.toml b/pyproject.toml index d9adb8cd..db6d99d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ [build-system] -requires = ["setuptools-scm>=6.0.0", "setuptools>=69.0.3"] +requires = ["setuptools-scm>=8.0.4", "setuptools>=71.0.4"] build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] +write_to = "src/mlx/warnings/__version__.py" diff --git a/setup.py b/setup.py index 44e3bb0e..da0cfe6a 100644 --- a/setup.py +++ b/setup.py @@ -10,9 +10,6 @@ setup( name='mlx.warnings', url=PROJECT_URL, - use_scm_version={ - 'write_to': 'src/mlx/warnings/__version__.py' - }, author='Bavo Van Achte', author_email='bavo.van.achte@gmail.com', description='Command-line alternative for https://github.com/jenkinsci/warnings-plugin. ' @@ -27,7 +24,7 @@ zip_safe=False, license='Apache License, Version 2.0', platforms='any', - packages=find_namespace_packages(where='src', include=['mlx.warnings']), + packages=find_namespace_packages(where='src', exclude=("doc.*", "doc", "tests.*", "tests", "build*")), package_dir={'': 'src'}, entry_points={'console_scripts': ['mlx-warnings = mlx.warnings.warnings:main']}, install_requires=requires, diff --git a/tox.ini b/tox.ini index fdbdee71..53069902 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ basepython = py310: {env:TOXPYTHON:python3.10} py311: {env:TOXPYTHON:python3.11} py312: {env:TOXPYTHON:python3.12} - {lxml_support,bootstrap,spell,docs,check,coverage,report,clean}: python3 + {lxml_support,spell,docs,check,coverage,report,clean}: python3 setenv = PYTHONPATH={toxinidir}/tests PYTHONUNBUFFERED=yes @@ -50,16 +50,6 @@ deps = commands = pytest -vv tests/ -[testenv:bootstrap] -deps = - jinja2 - matrix -skip_install = true -commands = - python ci/bootstrap.py -passenv = - * - [testenv:spell] setenv = SPELLCHECK=1