alvistack/v6.21.1

hswong3i · hswong3i · commit 6163041d43d0 · 2023-10-25T20:08:47.000+08:00
git clean -xdf git submodule sync --recursive git submodule update --recursive --init git submodule foreach --recursive git checkout -- . tar zcvf ../python-ansible-lint_6.21.1.orig.tar.gz --exclude=.git . debuild -uc -us cp python-ansible-lint.spec ../python-ansible-lint_6.21.1-1.spec cp ../python*-ansible-lint*6.21.1*.{gz,xz,spec,dsc} /osc/home\:alvistack/ansible-ansible-lint-6.21.1/ rm -rf ../python*-ansible-lint*6.21.1*.* ../ansible-lint*6.21.1*.* See ansible#3869 Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt
@@ -34,7 +34,7 @@ referencing==0.30.2
 requests==2.31.0
 rich==13.5.3
 rpds-py==0.10.3
-ruamel-yaml==0.17.33
+ruamel-yaml==0.18.2
 subprocess-tee==0.4.1
 tomli==2.0.1
 typing-extensions==4.8.0
diff --git a/.config/requirements-test.txt b/.config/requirements-test.txt
@@ -11,7 +11,7 @@ pytest >= 7.2.2
 pytest-mock
 pytest-plus >= 0.6 # for PYTEST_REQPASS
 pytest-xdist >= 2.1.0
-ruamel.yaml>=0.17.31,<0.18 # only the latest is expected to pass our tests
+ruamel.yaml>=0.17.31
 ruamel-yaml-clib  # needed for mypy
 types-jsonschema # IDE support
 types-pyyaml # IDE support
diff --git a/.config/requirements.in b/.config/requirements.in
@@ -10,7 +10,7 @@ packaging>=21.3 # Apache-2.0,BSD-2-Clause
 pathspec>=0.10.3 # Mozilla Public License 2.0 (MPL 2.0)
 pyyaml>=5.4.1 # MIT (centos 9 has 5.3.1)
 rich>=12.0.0 # MIT
-ruamel.yaml>=0.17.0,<0.18,!=0.17.29,!=0.17.30 # MIT, next version is planned to have breaking changes
+ruamel.yaml>=0.17.0,!=0.17.29,!=0.17.30 # MIT
 requests>=2.31.0 # Apache-2.0 (indirect, but we want newer version for security reasons)
 subprocess-tee>=0.4.1 # MIT, used by ansible-compat
 yamllint >= 1.30.0 # GPLv3
diff --git a/.config/requirements.txt b/.config/requirements.txt
@@ -92,7 +92,7 @@ regex==2023.8.8
 requests==2.31.0
 rich==13.5.3
 rpds-py==0.10.3
-ruamel-yaml==0.17.33
+ruamel-yaml==0.18.2
 six==1.16.0
 soupsieve==2.5
 subprocess-tee==0.4.1
diff --git a/.gitignore b/.gitignore
@@ -46,9 +46,6 @@ pip-wheel-metadata
 # mypy
 .mypy_cache
 
-# Generated by setuptools-scm
-src/ansiblelint/_version.py
-
 # Unformatted fixtures, need to be added with force as we need to exclude
 # them from being reformatted (.prettierignore is a symlink to .gitignore)
 test/fixtures/formatting-before/
@@ -62,7 +59,6 @@ examples/playbooks/vars/transform_nested_data.yml
 .DS_Store
 .vscode
 .idea
-src/ansiblelint/_version.py
 *.tar.gz
 .pytest_cache
 test/eco/CODENOTIFY.html
@@ -73,3 +69,5 @@ collections
 site
 _readthedocs
 *.tmp.*
+
+.pybuild/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -157,7 +157,7 @@ repos:
           - pytest>=7.2.2
           - rich>=13.2.0
           - ruamel-yaml-clib>=0.2.7
-          - ruamel-yaml>=0.17.31
+          - ruamel-yaml>=0.18.2
           - subprocess-tee
           - types-PyYAML
           - types-jsonschema>=4.4.2
@@ -188,7 +188,7 @@ repos:
           - pyyaml
           - rich>=13.2.0
           - ruamel-yaml-clib>=0.2.7
-          - ruamel-yaml>=0.17.31
+          - ruamel-yaml>=0.18.2
           - typing_extensions
           - wcmatch
           - yamllint
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,8 @@
+include COPYING
+include README.md
+
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]
+
+recursive-include src/ansiblelint/schemas **/*
+recursive-include src/ansiblelint/data **/*
diff --git a/debian/.gitignore b/debian/.gitignore
@@ -0,0 +1,6 @@
+*.substvars
+*debhelper*
+.debhelper
+files
+ansible-lint
+tmp
diff --git a/debian/ansible-lint.install b/debian/ansible-lint.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/lib/python*/*-packages/*
diff --git a/debian/ansible-lint.lintian-overrides b/debian/ansible-lint.lintian-overrides
@@ -0,0 +1,4 @@
+ansible-lint: copyright-without-copyright-notice
+ansible-lint: initial-upload-closes-no-bugs
+ansible-lint: no-manual-page
+ansible-lint: zero-byte-file-in-doc-directory
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,5 @@
+python-ansible-lint (100:6.21.1-1) UNRELEASED; urgency=medium
+
+  * https://github.com/ansible/ansible-lint/releases/tag/v6.21.1
+
+ -- Wong Hoi Sing Edison <hswong3i@pantarei-design.com>  Fri, 20 Oct 2023 11:44:43 +0800
diff --git a/debian/control b/debian/control
@@ -0,0 +1,42 @@
+Source: python-ansible-lint
+Section: python
+Priority: optional
+Standards-Version: 4.5.0
+Maintainer: Wong Hoi Sing Edison <hswong3i@gmail.com>
+Homepage: https://github.com/ansible/ansible-lint/tags
+Vcs-Browser: https://github.com/alvistack/ansible-ansible-lint
+Vcs-Git: https://github.com/alvistack/ansible-ansible-lint.git
+Build-Depends:
+ debhelper,
+ debhelper-compat (= 10),
+ dh-python,
+ fdupes,
+ python3-dev,
+ python3-setuptools,
+
+Package: ansible-lint
+Architecture: all
+Description: Best practices checker for Ansible
+ Checks playbooks for practices and behavior that could potentially be
+ improved.
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ ${python3:Depends},
+ ansible-core (>= 2.12.0),
+ black (>= 22.8.0),
+ python3,
+ python3-ansible-compat (>= 4.1.10),
+ python3-filelock (>= 3.3.0),
+ python3-jsonschema (>= 4.10.0),
+ python3-packaging (>= 21.3),
+ python3-pathspec (>= 0.10.3),
+ python3-requests (>= 2.31.0),
+ python3-rich (>= 12.0.0),
+ python3-ruamel.yaml (>= 0.17.31),
+ python3-subprocess-tee (>= 0.4.1),
+ python3-wcmatch (>= 8.1.2),
+ python3-yaml (>= 5.4.1),
+ yamllint (>= 1.30.0),
+Provides:
+ python3-ansible-lint,
diff --git a/debian/copyright b/debian/copyright
@@ -0,0 +1,21 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: debian/*
+Copyright: 2023 Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ The complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+SHELL := /bin/bash
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+	find debian/tmp/usr/lib/python*/*-packages -type f -name '*.pyc' -exec rm -rf {} \;
+	fdupes -qnrps debian/tmp/usr/lib/python*/*-packages
+
+override_dh_auto_test:
+
+override_dh_auto_clean:
+
+%:
+	dh $@ --buildsystem=pybuild --with python3
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
@@ -0,0 +1,4 @@
+python-ansible-lint source: file-without-copyright-information
+python-ansible-lint source: no-debian-changes
+python-ansible-lint source: source-contains-prebuilt-windows-binary
+python-ansible-lint source: source-package-encodes-python-version
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,16 +1,15 @@
 [build-system]
 requires = [
   "setuptools >= 65.3.0", # required by pyproject+setuptools_scm integration and editable installs
-  "setuptools_scm[toml] >= 7.0.5", # required for "no-local-version" scheme
-
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 # https://peps.python.org/pep-0621/#readme
 requires-python = ">=3.9"
-dynamic = ["version", "dependencies", "optional-dependencies"]
+dynamic = ["dependencies", "optional-dependencies"]
 name = "ansible-lint"
+version = "6.21.1"
 description = "Checks playbooks for practices and behavior that could potentially be improved"
 readme = "README.md"
 authors = [{ "name" = "Will Thames", "email" = "will@thames.id.au" }]
@@ -285,7 +284,3 @@ optional-dependencies.docs = { file = [".config/requirements-docs.txt"] }
 optional-dependencies.test = { file = [".config/requirements-test.txt"] }
 optional-dependencies.lock = { file = [".config/requirements-lock.txt"] }
 dependencies = { file = [".config/requirements.in"] }
-
-[tool.setuptools_scm]
-local_scheme = "no-local-version"
-write_to = "src/ansiblelint/_version.py"
diff --git a/python-ansible-lint.spec b/python-ansible-lint.spec
@@ -0,0 +1,82 @@
+# Copyright 2023 Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+%global debug_package %{nil}
+
+Name: python-ansible-lint
+Epoch: 100
+Version: 6.21.1
+Release: 1%{?dist}
+BuildArch: noarch
+Summary: Best practices checker for Ansible
+License: GPL-3.0-or-later
+URL: https://github.com/ansible/ansible-lint/tags
+Source0: %{name}_%{version}.orig.tar.gz
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+
+%description
+Checks playbooks for practices and behavior that could potentially be
+improved.
+
+%prep
+%autosetup -T -c -n %{name}_%{version}-%{release}
+tar -zx -f %{S:0} --strip-components=1 -C .
+
+%build
+%py3_build
+
+%install
+%py3_install
+find %{buildroot}%{python3_sitelib} -type f -name '*.pyc' -exec rm -rf {} \;
+fdupes -qnrps %{buildroot}%{python3_sitelib}
+
+%check
+
+%package -n ansible-lint
+Summary: Best practices checker for Ansible
+Requires: ansible-core >= 2.12.0
+Requires: black >= 22.8.0
+Requires: python3
+Requires: python3-ansible-compat >= 4.1.10
+Requires: python3-filelock >= 3.3.0
+Requires: python3-jsonschema >= 4.10.0
+Requires: python3-packaging >= 21.3
+Requires: python3-pathspec >= 0.10.3
+Requires: python3-pyyaml >= 5.4.1
+Requires: python3-requests >= 2.31.0
+Requires: python3-rich >= 12.0.0
+Requires: python3-ruamel-yaml >= 0.17.31
+Requires: python3-subprocess-tee >= 0.4.1
+Requires: python3-wcmatch >= 8.1.2
+Requires: python3-yamllint >= 1.30.0
+Provides: python3-ansible-lint = %{epoch}:%{version}-%{release}
+Provides: python3dist(ansible-lint) = %{epoch}:%{version}-%{release}
+Provides: python%{python3_version}-ansible-lint = %{epoch}:%{version}-%{release}
+Provides: python%{python3_version}dist(ansible-lint) = %{epoch}:%{version}-%{release}
+Provides: python%{python3_version_nodots}-ansible-lint = %{epoch}:%{version}-%{release}
+Provides: python%{python3_version_nodots}dist(ansible-lint) = %{epoch}:%{version}-%{release}
+
+%description -n ansible-lint
+Checks playbooks for practices and behavior that could potentially be
+improved.
+
+%files -n ansible-lint
+%license COPYING
+%{_bindir}/*
+%{python3_sitelib}/*
+
+%changelog
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/setup.py b/setup.py
@@ -0,0 +1,10 @@
+#! /usr/bin/env python3
+"""Ansible-lint distribution package setuptools installer.
+
+The presence of this file ensures the support
+of pip editable mode *with setuptools only*.
+"""
+import setuptools
+
+# https://github.com/jazzband/pip-tools/issues/1278
+setuptools.setup()
diff --git a/src/ansiblelint/_version.py b/src/ansiblelint/_version.py
@@ -0,0 +1,4 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+__version__ = version = '6.21.1'
+__version_tuple__ = version_tuple = (6, 21, 1)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+usr/bin/*`
	`2`	`+usr/lib/python/-packages/*`