
* Adding a py4j variant that requires Java via spack to avoid situations where a system doesn't have Java and py4j expects it * Adding new versions of py-pyspark * Adding a new variant to require java (via py4j) and clean up dependency handling * Adding myself as a maintainer for py-pyspark and py-py4j * Fix overlooked version bump in py4j * Version bump to meet py-spark expectations * Version bump to add latest compatibile version with pyspark * Matching py-grpcio bump * Adding variants and dependents for pyspark * Adding runtime deps * Changing default java requirement. I'm not sure this is the right call * Changing py4j with java dependency handling * Fix style * Update package.py fix unnecessary f-strinh * Make +java the default for both * Fix nested deps * Revert styles after default change * Added new versions and GCC 14 compatbility conflicts * Added new versions and compatibility conflicts for gcc 14 * Added new versions paired to arrow (for gcc14 compat) * Update py-protobuf compiler conflict * Update depends to match See https://github.com/grpc/grpc/blob/master/src/python/grpcio_status/setup.py * Updating dependencies and conflicts for py-googleapis-common-protos. Added new version to avoid future issues * Remove upper bound version on py-protobuf and add default_args * Adding new versions and updating dependencies back to versions 1.35.0 * Updating oldest numpy deps * Fixing merge * bit more cleaniness for var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py * Adding latest matching version of py-grpcio and py-grpcio-status * Update package.py https://github.com/spack/spack/pull/44263#discussion_r1612317943 * Update dependencies * Adding additional versions for dependent packages. Deprecated two versions: 1.16 is old, built for python ~3.6, and does not build for 3.8. 1.52.0 was removed from pypi * Revert py-grpcio-tools changes. Will include in separate PR * Adding patches and constraints to get 1.48 to build as it's a dependency that is called out for some other packages * Updating to account for yanked packages for dependencies * Fix style * Update sha256 for py-grpcio v0.16.0 to reflect change --------- Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
22 lines
800 B
Diff
22 lines
800 B
Diff
diff --git a/setup.py b/setup.py
|
|
index 8c428cb7f32b4..2646af5fd5ebb 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -214,11 +214,11 @@ def check_linker_need_libatomic():
|
|
return False
|
|
# Double-check to see if -latomic actually can solve the problem.
|
|
# https://github.com/grpc/grpc/issues/22491
|
|
- cpp_test = subprocess.Popen(
|
|
- [cxx, '-x', 'c++', '-std=c++14', '-', '-latomic'],
|
|
- stdin=PIPE,
|
|
- stdout=PIPE,
|
|
- stderr=PIPE)
|
|
+ cpp_test = subprocess.Popen(cxx +
|
|
+ ['-x', 'c++', '-std=c++14', '-', '-latomic'],
|
|
+ stdin=PIPE,
|
|
+ stdout=PIPE,
|
|
+ stderr=PIPE)
|
|
cpp_test.communicate(input=code_test)
|
|
return cpp_test.returncode == 0
|
|
|