Merge pull request ansible#9774 from shanemcd/receptorctl-pypi

Use receptorctl from pypi Reviewed-by: Yanis Guenane <None>
nixocio · Mar 31, 2021 · 416951c · 416951c
2 parents 5eae035 + c39a405
commit 416951c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/docs/licenses/receptor.txt → docs/licenses/receptorctl.txt b/docs/licenses/receptor.txt → docs/licenses/receptorctl.txt
diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -37,11 +37,13 @@ openshift>=0.11.0  # minimum version to pull in new pyyaml for CVE-2017-18342
 pexpect==4.7.0 # see library notes
 prometheus_client
 psycopg2
+psutil
 pygerduty
 pyparsing
 python3-saml
 python-ldap>=3.3.1 # https://github.com/python-ldap/python-ldap/issues/270
 pyyaml>=5.4.1  # minimum to fix https://github.com/yaml/pyyaml/issues/478
+receptorctl
 schedule==0.6.0
 social-auth-core==3.3.1  # see UPGRADE BLOCKERs
 social-auth-app-django==3.1.0  # see UPGRADE BLOCKERs

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -5,8 +5,7 @@ aiohttp==3.6.2
 aioredis==1.3.1
     # via channels-redis
 ansible-runner==2.0.0a1
-    # via
-    #   -r /awx_devel/requirements/requirements.in
+    # via -r /awx_devel/requirements/requirements.in
 ansiconv==1.0.0
     # via -r /awx_devel/requirements/requirements.in
 asciichartpy==1.5.25
@@ -230,8 +229,8 @@ pkgconfig==1.5.1
     # via xmlsec
 prometheus-client==0.7.1
     # via -r /awx_devel/requirements/requirements.in
-psutil==5.7.0
-    # via ansible-runner
+psutil==5.8.0
+    # via -r /awx_devel/requirements/requirements.in
 psycopg2==2.8.4
     # via -r /awx_devel/requirements/requirements.in
 ptyprocess==0.6.0
@@ -296,7 +295,8 @@ pyyaml==5.4.1
     #   djangorestframework-yaml
     #   kubernetes
     #   receptorctl
-    # via -r /awx_devel/requirements/requirements_git.txt
+receptorctl==0.9.7
+    # via -r /awx_devel/requirements/requirements.in
 redis==3.4.1
     # via
     #   -r /awx_devel/requirements/requirements.in
@@ -411,5 +411,4 @@ setuptools==41.6.0
     #   kubernetes
     #   markdown
     #   python-daemon
-    #   receptorctl
     #   zope.interface
diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt
@@ -1,2 +1 @@
 git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
-git+https://github.com/project-receptor/receptor.git@0.9.6#egg=receptorctl&subdirectory=receptorctl
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
		git+https://github.com/project-receptor/receptor.git@0.9.6#egg=receptorctl&subdirectory=receptorctl