Make scripts and entry_points mutually exclusive based on setuptools presence (#650)

admp-fh · web-flow · commit f0079047dddf · 2022-10-06T12:25:30.000-07:00
When installing newrelic-admin with setuptools, the newrelic-admin shim is written to bin multiple times due to the inclusion of both `scripts` and `entry-points` as arguments to `setup`. This poses problems for installers that comply with newer PEP standards, such as the Pypa `installer` package: https://github.com/pypa/installer
diff --git a/setup.py b/setup.py
@@ -154,14 +154,15 @@ def build_extension(self, ext):
     package_data={
         "newrelic": ["newrelic.ini", "version.txt", "packages/urllib3/LICENSE.txt", "common/cacert.pem"],
     },
-    scripts=["scripts/newrelic-admin"],
     extras_require={"infinite-tracing": ["grpcio", "protobuf"]},
 )
 
 if with_setuptools:
     kwargs["entry_points"] = {
         "console_scripts": ["newrelic-admin = newrelic.admin:main"],
     }
+else:
+    kwargs["scripts"] = ["scripts/newrelic-admin"]
 
 
 def with_librt():

Original file line number	Diff line number	Diff line change
`@@ -154,14 +154,15 @@ def build_extension(self, ext):`
`154`	`154`	`package_data={`
`155`	`155`	`"newrelic": ["newrelic.ini", "version.txt", "packages/urllib3/LICENSE.txt", "common/cacert.pem"],`
`156`	`156`	`},`
`157`		`- scripts=["scripts/newrelic-admin"],`
`158`	`157`	`extras_require={"infinite-tracing": ["grpcio", "protobuf"]},`
`159`	`158`	`)`
`160`	`159`
`161`	`160`	`if with_setuptools:`
`162`	`161`	`kwargs["entry_points"] = {`
`163`	`162`	`"console_scripts": ["newrelic-admin = newrelic.admin:main"],`
`164`	`163`	`}`
	`164`	`+else:`
	`165`	`+ kwargs["scripts"] = ["scripts/newrelic-admin"]`
`165`	`166`
`166`	`167`
`167`	`168`	`def with_librt():`