Skip to content

Commit ffb1f3d

Browse files
WillAydWillAyd
committed
cmake-format all files
1 parent 55a0a3f commit ffb1f3d

File tree

5 files changed

+55
-43
lines changed

5 files changed

+55
-43
lines changed

‎CMakeLists.txt

+6-4
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ project(pandas)
1010

1111
if(WIN32)
1212
if(NOT CMAKE_BUILD_TYPE)
13-
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
13+
set(CMAKE_BUILD_TYPE
14+
Release
15+
CACHE STRING "Build type" FORCE)
1416
endif()
1517
find_package(Python3 REQUIRED COMPONENTS Interpreter Development NumPy)
1618
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "")
1719
link_directories(${Python3_LIBRARY_DIRS})
18-
else ()
20+
else()
1921
# we only choose Development.Module to support virtual environments where
20-
# libpython may not be available
21-
# see https://github.com/pypa/manylinux/issues/484
22+
# libpython may not be available see
23+
# https://github.com/pypa/manylinux/issues/484
2224
find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module NumPy)
2325
endif()
2426

‎pandas/_libs/CMakeLists.txt

+37-30
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@ add_custom_command(
1313
OUTPUT algos.c
1414
COMMAND ${Python3_EXECUTABLE} -m cython -3 algos.pyx
1515
DEPENDS algos_common_helper.pxi algos_take_helper.pxi)
16-
Python3_add_library(algos MODULE WITH_SOABI algos.c)
17-
target_include_directories(algos PUBLIC ${Python3_INCLUDE_DIRS}
18-
${Python3_NumPy_INCLUDE_DIRS} "src/klib")
19-
20-
# There is a khash header file in src/klib and a cython generated
21-
# one in _libs. Depending on the build timing one of the other could
22-
# get picked up, though unclear why we need both? If we stick to the
23-
# non-generated version we can remove any DEPENDS khash.h
16+
python3_add_library(algos MODULE WITH_SOABI algos.c)
17+
target_include_directories(
18+
algos PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "src/klib")
19+
20+
# There is a khash header file in src/klib and a cython generated one in _libs.
21+
# Depending on the build timing one of the other could get picked up, though
22+
# unclear why we need both? If we stick to the non-generated version we can
23+
# remove any DEPENDS khash.h
2424
add_custom_command(
2525
OUTPUT khash.h
2626
COMMAND ${Python3_EXECUTABLE} -m cython -3 khash.pxd
27-
DEPENDS hkash_for_primitive_helper.pxi
28-
)
27+
DEPENDS hkash_for_primitive_helper.pxi)
2928

3029
add_custom_command(
3130
OUTPUT hashtable.c
3231
COMMAND ${Python3_EXECUTABLE} -m cython -3 hashtable.pyx
3332
DEPENDS hashtable_class_helper.pxi hashtable_func_helper.pxi)
3433

35-
Python3_add_library(hashtable MODULE WITH_SOABI hashtable.c)
34+
python3_add_library(hashtable MODULE WITH_SOABI hashtable.c)
3635
target_include_directories(
3736
hashtable PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
3837
"src/klib" DEPENDS khash.h)
@@ -41,7 +40,7 @@ add_custom_command(
4140
OUTPUT index.c
4241
COMMAND ${Python3_EXECUTABLE} -m cython -3 index.pyx
4342
DEPENDS index_class_helper.pxi)
44-
Python3_add_library(index MODULE WITH_SOABI index.c)
43+
python3_add_library(index MODULE WITH_SOABI index.c)
4544
target_include_directories(
4645
index PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "src/klib"
4746
"./tslibs")
@@ -50,7 +49,7 @@ add_custom_command(
5049
OUTPUT interval.c
5150
COMMAND ${Python3_EXECUTABLE} -m cython -3 interval.pyx
5251
DEPENDS intervaltree.pxi)
53-
Python3_add_library(interval MODULE WITH_SOABI interval.c)
52+
python3_add_library(interval MODULE WITH_SOABI interval.c)
5453
target_include_directories(
5554
interval PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
5655
"src/klib" "./tslibs")
@@ -59,9 +58,10 @@ add_custom_command(
5958
OUTPUT sparse.c
6059
COMMAND ${Python3_EXECUTABLE} -m cython -3 sparse.pyx
6160
DEPENDS sparse_op_helper.pxi)
62-
Python3_add_library(sparse MODULE WITH_SOABI sparse.c)
61+
python3_add_library(sparse MODULE WITH_SOABI sparse.c)
6362
target_include_directories(
64-
sparse PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "src/klib")
63+
sparse PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
64+
"src/klib")
6565

6666
set(BASIC_LIBRARIES
6767
arrays
@@ -79,7 +79,7 @@ set(BASIC_LIBRARIES
7979
foreach(LIB ${BASIC_LIBRARIES})
8080
add_custom_command(OUTPUT ${LIB}.c COMMAND ${Python3_EXECUTABLE} -m cython -3
8181
${LIB}.pyx)
82-
Python3_add_library(${LIB} MODULE WITH_SOABI ${LIB}.c)
82+
python3_add_library(${LIB} MODULE WITH_SOABI ${LIB}.c)
8383
target_include_directories(${LIB} PUBLIC ${Python3_INCLUDE_DIRS}
8484
${Python3_NumPy_INCLUDE_DIRS})
8585
endforeach()
@@ -88,38 +88,45 @@ add_subdirectory("tslibs")
8888

8989
add_custom_command(OUTPUT tslib.c COMMAND ${Python3_EXECUTABLE} -m cython -3
9090
tslib.pyx)
91-
Python3_add_library(tslib ${LIB} MODULE WITH_SOABI tslib.c tslibs/src/datetime/np_datetime.c)
92-
target_include_directories(tslib PUBLIC ${Python3_INCLUDE_DIRS}
93-
${Python3_NumPy_INCLUDE_DIRS} "./tslibs")
91+
python3_add_library(tslib ${LIB} MODULE WITH_SOABI tslib.c
92+
tslibs/src/datetime/np_datetime.c)
93+
target_include_directories(
94+
tslib PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "./tslibs")
9495

9596
add_custom_command(OUTPUT missing.c COMMAND ${Python3_EXECUTABLE} -m cython -3
9697
missing.pyx)
97-
Python3_add_library(missing MODULE WITH_SOABI missing.c)
98+
python3_add_library(missing MODULE WITH_SOABI missing.c)
9899
target_include_directories(
99-
missing PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "./tslibs")
100+
missing PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
101+
"./tslibs")
100102

101103
add_custom_command(OUTPUT lib.c COMMAND ${Python3_EXECUTABLE} -m cython -3
102104
lib.pyx)
103-
Python3_add_library(lib MODULE WITH_SOABI lib.c src/parser/tokenizer.c)
105+
python3_add_library(lib MODULE WITH_SOABI lib.c src/parser/tokenizer.c)
104106
target_include_directories(
105107
lib PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "src/klib"
106108
"./tslibs")
107109

108-
add_custom_command(OUTPUT join.c COMMAND ${Python3_EXECUTABLE} -m cython -3
109-
join.pyx DEPENDS khash_for_primitive_helper.pxi)
110-
Python3_add_library(join MODULE WITH_SOABI join.c)
110+
add_custom_command(
111+
OUTPUT join.c
112+
COMMAND ${Python3_EXECUTABLE} -m cython -3 join.pyx
113+
DEPENDS khash_for_primitive_helper.pxi)
114+
python3_add_library(join MODULE WITH_SOABI join.c)
111115
target_include_directories(join PUBLIC ${Python3_INCLUDE_DIRS}
112116
${Python3_NumPy_INCLUDE_DIRS} "src/klib")
113117

114118
add_custom_command(OUTPUT parsers.c COMMAND ${Python3_EXECUTABLE} -m cython -3
115119
parsers.pyx)
116-
Python3_add_library(parsers MODULE WITH_SOABI parsers.c src/parser/tokenizer.c src/parser/io.c)
120+
python3_add_library(parsers MODULE WITH_SOABI parsers.c src/parser/tokenizer.c
121+
src/parser/io.c)
117122
target_include_directories(
118-
parsers PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS} "src/klib"
119-
"src")
123+
parsers PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
124+
"src/klib" "src")
120125

121-
Python3_add_library(
122-
ujson MODULE WITH_SOABI
126+
python3_add_library(
127+
ujson
128+
MODULE
129+
WITH_SOABI
123130
src/ujson/python/ujson.c
124131
src/ujson/python/objToJSON.c
125132
src/ujson/python/date_conversions.c

‎pandas/_libs/tslibs/CMakeLists.txt

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(BASIC_LIBRARIES base ccalendar dtypes nattype strptime timezones)
22
foreach(LIB ${BASIC_LIBRARIES})
33
add_custom_command(OUTPUT ${LIB}.c COMMAND ${Python3_EXECUTABLE} -m cython -3
44
${LIB}.pyx)
5-
Python3_add_library(${LIB} MODULE WITH_SOABI ${LIB}.c)
5+
python3_add_library(${LIB} MODULE WITH_SOABI ${LIB}.c)
66
target_include_directories(${LIB} PUBLIC ${Python3_INCLUDE_DIRS}
77
${Python3_NumPy_INCLUDE_DIRS})
88
endforeach()
@@ -19,22 +19,25 @@ set(NP_DATETIME_REQUIRING
1919
foreach(LIB ${NP_DATETIME_REQUIRING})
2020
add_custom_command(OUTPUT ${LIB}.c COMMAND ${Python3_EXECUTABLE} -m cython -3
2121
${LIB}.pyx)
22-
Python3_add_library(${LIB} MODULE WITH_SOABI ${LIB}.c src/datetime/np_datetime.c)
22+
python3_add_library(${LIB} MODULE WITH_SOABI ${LIB}.c
23+
src/datetime/np_datetime.c)
2324
target_include_directories(
2425
${LIB} PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
2526
"src/datetime")
2627
endforeach()
2728

2829
add_custom_command(OUTPUT np_datetime.c COMMAND ${Python3_EXECUTABLE} -m cython
2930
-3 np_datetime.pyx)
30-
Python3_add_library(np_datetime MODULE WITH_SOABI np_datetime.c src/datetime/np_datetime.c
31-
src/datetime/np_datetime_strings.c)
31+
python3_add_library(
32+
np_datetime MODULE WITH_SOABI np_datetime.c src/datetime/np_datetime.c
33+
src/datetime/np_datetime_strings.c)
3234
target_include_directories(np_datetime PUBLIC ${Python3_INCLUDE_DIRS}
3335
${Python3_NumPy_INCLUDE_DIRS})
3436

3537
add_custom_command(OUTPUT parsing.c COMMAND ${Python3_EXECUTABLE} -m cython -3
3638
parsing.pyx)
37-
Python3_add_library(parsing MODULE WITH_SOABI parsing.c "../src/parser/tokenizer.c")
39+
python3_add_library(parsing MODULE WITH_SOABI parsing.c
40+
"../src/parser/tokenizer.c")
3841
target_include_directories(
3942
parsing PUBLIC ${Python3_INCLUDE_DIRS} ${Python3_NumPy_INCLUDE_DIRS}
4043
"../src/klib")

‎pandas/_libs/window/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
add_custom_command(OUTPUT indexers.c COMMAND ${Python3_EXECUTABLE} -m cython -3
22
indexers.pyx)
3-
Python3_add_library(indexers MODULE WITH_SOABI indexers.c)
3+
python3_add_library(indexers MODULE WITH_SOABI indexers.c)
44
target_include_directories(indexers PUBLIC ${Python3_INCLUDE_DIRS}
55
${Python3_NumPy_INCLUDE_DIRS})
66

77
add_custom_command(
88
OUTPUT aggregations.cpp COMMAND ${Python3_EXECUTABLE} -m cython -3 --cplus
99
aggregations.pyx)
10-
Python3_add_library(aggregations MODULE WITH_SOABI aggregations.cpp)
10+
python3_add_library(aggregations MODULE WITH_SOABI aggregations.cpp)
1111
target_include_directories(aggregations PUBLIC ${Python3_INCLUDE_DIRS}
1212
${Python3_NumPy_INCLUDE_DIRS})

‎pandas/io/sas/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_custom_command(OUTPUT _sas.c COMMAND ${Python3_EXECUTABLE} -m cython -3
22
_sas.pyx)
3-
Python3_add_library(_sas MODULE WITH_SOABI _sas.c)
3+
python3_add_library(_sas MODULE WITH_SOABI _sas.c)
44
target_include_directories(_sas PUBLIC ${Python3_INCLUDE_DIRS}
5-
${Python3_NumPy_INCLUDE_DIRS})
5+
${Python3_NumPy_INCLUDE_DIRS})

0 commit comments

Comments
 (0)