diff options
| author | softwarefactory-project-zuul[bot] <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> | 2020-04-29 21:24:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 21:24:57 +0200 |
| commit | 72de660ea1039039ffd7e7c72d72e5a44ffcbdf7 (patch) | |
| tree | 5b485c4a14b2d599109569a76cb8ddde5874193b | |
| parent | Merge pull request #6877 from ryanpetrello/install-doc-cleanup (diff) | |
| parent | update the 11.2.0 changelog (diff) | |
| download | awx-11.2.0.tar.xz awx-11.2.0.zip | |
Merge pull request #6880 from ryanpetrello/fix-awxkit-new-pip11.2.0
Keep awxkit's requirements on the setup.py
Reviewed-by: Jacob Callahan
https://github.com/JacobCallahan
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | awxkit/requirements.txt | 3 | ||||
| -rw-r--r-- | awxkit/setup.py | 11 |
3 files changed, 6 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 403a7d703c..65c4adfa02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ This is a list of high-level changes for each release of AWX. A full list of com - Added Project (Domain Name) support for the OpenStack Keystone v3 API (https://github.com/ansible/awx/issues/6831) - Added a new setting for raising log verbosity for rsyslogd (https://github.com/ansible/awx/pull/6818) - Added the ability to monitor stdout in the CLI for running jobs and workflow jobs (https://github.com/ansible/awx/issues/6165) +- Fixed a bug which prevented the AWX CLI from properly installing with newer versions of pip (https://github.com/ansible/awx/issues/6870) - Fixed a bug which broke AWX's external logging support when configured with HTTPS endpoints that utilize self-signed certificates (https://github.com/ansible/awx/issues/6851) - Fixed a local docker installer bug that mistakenly attempted to upgrade PostgreSQL when an external pg_hostname is specified (https://github.com/ansible/awx/pull/5398) - Fixed a race condition that caused task container crashes when pods are quickly brought down and back up (https://github.com/ansible/awx/issues/6750) diff --git a/awxkit/requirements.txt b/awxkit/requirements.txt index 6c9fdba970..9c558e357c 100644 --- a/awxkit/requirements.txt +++ b/awxkit/requirements.txt @@ -1,2 +1 @@ -PyYAML -requests +. diff --git a/awxkit/setup.py b/awxkit/setup.py index 2f304f2600..7dac7a7b8e 100644 --- a/awxkit/setup.py +++ b/awxkit/setup.py @@ -2,12 +2,6 @@ import os import glob import shutil from setuptools import setup, find_packages, Command -try: # for pip >= 10 - from pip._internal.req import parse_requirements -except ImportError: # for pip <= 9.0.3 - from pip.req import parse_requirements - -requirements = [str(r.req) for r in parse_requirements('requirements.txt', session=False)] def get_version(): @@ -66,7 +60,10 @@ setup( 'clean': CleanCommand, }, include_package_data=True, - install_requires=requirements, + install_requires=[ + 'PyYAML', + 'requests', + ], python_requires=">=3.6", extras_require={ 'formatting': ['jq'], |