diff options
| author | Matt Clay <matt@mystile.com> | 2023-05-01 11:03:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-01 11:03:10 -0700 |
| commit | 6f4d3a79448a910b24d8fedb76009440551e4265 (patch) | |
| tree | 227ea0f76b602a1c7a52157e5fb8c20043ce4b12 /test | |
| parent | c1e81778084da20f30a8188f0b7d1e0994d4f6f4 (diff) | |
| download | ansible-6f4d3a79448a910b24d8fedb76009440551e4265.tar.gz | |
Backport setuptools fixes (#80684)
* Use package_data instead of include_package_data (#80652)
This resolves warnings generated by setuptools such as the following:
_Warning: Package 'ansible.galaxy.data' is absent from the `packages` configuration.
(cherry picked from commit 5ac292e12d5e1515beb34028346d76bb68398fc8)
* Set the minimum setuptools to 45.2.0 (#80649)
Also update the package-data sanity test to use the minimum setuptools version.
(cherry picked from commit 4d25e3d54f7de316c4f1d1575d2cf1ffa46b632c)
Diffstat (limited to 'test')
| -rw-r--r-- | test/sanity/code-smell/package-data.py | 3 | ||||
| -rw-r--r-- | test/sanity/code-smell/package-data.requirements.in | 1 | ||||
| -rw-r--r-- | test/sanity/code-smell/package-data.requirements.txt | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/test/sanity/code-smell/package-data.py b/test/sanity/code-smell/package-data.py index ddfdda09a2..c3c4e6e8e2 100644 --- a/test/sanity/code-smell/package-data.py +++ b/test/sanity/code-smell/package-data.py @@ -188,9 +188,10 @@ def create_sdist(tmp_dir): ) stderr = create.stderr + stdout = create.stdout if create.returncode != 0: - raise Exception('make snapshot failed:\n%s' % stderr) + raise Exception('make snapshot failed:\n%s' % stderr + '\n' + stdout) # Determine path to sdist tmp_dir_files = os.listdir(tmp_dir) diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in index f587e39d21..deb5067889 100644 --- a/test/sanity/code-smell/package-data.requirements.in +++ b/test/sanity/code-smell/package-data.requirements.in @@ -5,3 +5,4 @@ pyyaml # ansible-core requirement resolvelib < 1.1.0 rstcheck < 6 # match version used in other sanity tests antsibull-changelog +setuptools == 45.2.0 # minimum supported setuptools diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt index 393c1a0d1c..c4b6119bf7 100644 --- a/test/sanity/code-smell/package-data.requirements.txt +++ b/test/sanity/code-smell/package-data.requirements.txt @@ -10,6 +10,7 @@ PyYAML==6.0 resolvelib==1.0.1 rstcheck==5.0.0 semantic-version==2.10.0 +setuptools==45.2.0 tomli==2.0.1 types-docutils==0.18.3 typing_extensions==4.5.0 |