Skip to content

Commit bb3aa7d

Browse files
committed
Simplifications and cleanups
1 parent 8b43cb6 commit bb3aa7d

File tree

7 files changed

+3
-66
lines changed

7 files changed

+3
-66
lines changed

cpp/meson.options

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ option(
1919
'acero',
2020
type: 'feature',
2121
description: 'Build the Arrow Acero Engine Module',
22-
yield: true,
2322
)
2423
option(
2524
'azure',
2625
type: 'feature',
2726
description: 'Build Arrow with Azure support (requires the Azure SDK for C++)',
28-
yield: true,
2927
)
3028

3129
option(
@@ -45,7 +43,6 @@ option(
4543
'dataset',
4644
type: 'feature',
4745
description: 'Build the Arrow Dataset Modules',
48-
yield: true,
4946
)
5047
option(
5148
'filesystem',
@@ -62,15 +59,9 @@ option(
6259
'gcs',
6360
type: 'feature',
6461
description: 'Build Arrow with GCS support (requires the Google Cloud Platform C++ Client Libraries)',
65-
yield: true,
6662
)
6763

68-
option(
69-
'hdfs',
70-
type: 'feature',
71-
description: 'Build the Arrow HDFS bridge',
72-
yield: true,
73-
)
64+
option('hdfs', type: 'feature', description: 'Build the Arrow HDFS bridge')
7465

7566
option(
7667
'integration',
@@ -85,18 +76,12 @@ option(
8576
value: 'enabled',
8677
)
8778

88-
option(
89-
'json',
90-
type: 'feature',
91-
description: 'Build Arrow with JSON support',
92-
yield: true,
93-
)
79+
option('json', type: 'feature', description: 'Build Arrow with JSON support')
9480

9581
option(
9682
'flight',
9783
type: 'feature',
9884
description: 'Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)',
99-
yield: true,
10085
)
10186

10287
option('git_id', type: 'string')
@@ -109,12 +94,7 @@ option(
10994
type: 'string',
11095
description: 'Arbitrary string that identifies the kind of package (for informational purposes)',
11196
)
112-
option(
113-
'parquet',
114-
type: 'feature',
115-
description: 'Build the Parquet libraries',
116-
yield: true,
117-
)
97+
option('parquet', type: 'feature', description: 'Build the Parquet libraries')
11898
option(
11999
'parquet_build_executables',
120100
type: 'feature',
@@ -129,21 +109,18 @@ option(
129109
'parquet_require_encryption',
130110
type: 'feature',
131111
description: 'Build support for encryption. Fail if OpenSSL is not found',
132-
yield: true,
133112
)
134113

135114
option('snappy', type: 'feature', description: 'Build with snappy compression')
136115
option(
137116
'substrait',
138117
type: 'feature',
139118
description: 'Build the Arrow Substrait Consumer Module',
140-
yield: true,
141119
)
142120
option(
143121
's3',
144122
type: 'feature',
145123
description: 'Build Arrow with S3 support (requires the AWS SDK for C++)',
146-
yield: true,
147124
)
148125

149126
option(

dev/release/rat_exclude_files.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ python/pyarrow/tests/__init__.py
6666
python/pyarrow/vendored/*
6767
python/pyarrow/src/arrow/python/vendored/*
6868
python/requirements*.txt
69-
python/subprojects/*
7069
pax_global_header
7170
MANIFEST.in
7271
__init__.pxd

python/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,3 @@ pyarrow/_table_api.h
4545
manylinux1/arrow
4646
nm_arrow.log
4747
visible_symbols.log
48-
49-
# meson files
50-
subprojects/.wraplock

python/meson.options

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,6 @@ option(
7171
value: 'auto',
7272
)
7373

74-
# TODO: check how CMake handled the JSON feature - was not there when
75-
# we started this branch, but may have been added later. Required by
76-
# pyarrow.lib
77-
option(
78-
'json',
79-
type: 'feature',
80-
description: 'Build Arrow with JSON support',
81-
value: 'auto',
82-
)
83-
8474
option(
8575
'orc',
8676
type: 'feature',

python/pyarrow/src/arrow/python/CMakeLists.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

python/pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,3 @@ version_file = 'pyarrow/_generated_version.py'
9393
version_scheme = 'guess-next-dev'
9494
git_describe_command = 'git describe --dirty --tags --long --match "apache-arrow-[0-9]*.*"'
9595
fallback_version = '23.0.0a0'
96-
97-
# TODO: see if shared helps with file sizes
98-
# https://mesonbuild.com/meson-python/how-to-guides/shared-libraries.html#shared-library-from-subproject
99-
[tool.meson-python.args]
100-
setup = ['--default-library=static']
101-
install = ['--skip-subprojects']

python/subprojects/arrow

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)