Skip to content

Commit e346774

Browse files
committed
BLD: spring cleaning on Makefile
1 parent 657d255 commit e346774

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Makefile

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
tseries: pandas/lib.pyx pandas/tslib.pyx pandas/hashtable.pyx
22
python setup.py build_ext --inplace
33

4-
.PHONY : clean develop build clean clean_pyc tseries doc
4+
.PHONY : develop build clean clean_pyc tseries doc
55

6-
clean: clean_pyc
7-
-rm -rf build dist
8-
-find . -name '*.so' -exec rm {} \;
6+
clean:
7+
-python setup.py clean
98

109
clean_pyc:
11-
-find . -name '*.pyc' -exec rm {} \; -or -name '*.pyo' -exec rm {} \;
10+
-find . -name '*.py[co]' -exec rm {} \;
1211

1312
sparse: pandas/src/sparse.pyx
1413
python setup.py build_ext --inplace
@@ -20,8 +19,7 @@ develop: build
2019
-python setup.py develop
2120

2221
doc:
23-
-rm -rf doc/build
24-
-rm -rf doc/source/generated
22+
-rm -rf doc/build doc/source/generated
2523
cd doc; \
2624
python make.py clean; \
2725
python make.py html

doc/source/release.rst

+2
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ Bug Fixes
314314
- Bug in setting a tz-aware index directly via ``.index`` (:issue:`6785`)
315315
- Bug in expressions.py where numexpr would try to evaluate arithmetic ops
316316
(:issue:`6762`).
317+
- Bug in Makefile where it didn't remove Cython generated C files with ``make
318+
clean`` (:issue:`6768`)
317319

318320
pandas 0.13.1
319321
-------------

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def initialize_options(self):
280280
'ultrajsondec.c',
281281
]
282282

283-
for root, dirs, files in list(os.walk('pandas')):
283+
for root, dirs, files in os.walk('pandas'):
284284
for f in files:
285285
if f in self._clean_exclude:
286286
continue
@@ -297,7 +297,7 @@ def initialize_options(self):
297297
if d == '__pycache__':
298298
self._clean_trees.append(pjoin(root, d))
299299

300-
for d in ('build',):
300+
for d in ('build', 'dist'):
301301
if os.path.exists(d):
302302
self._clean_trees.append(d)
303303

0 commit comments

Comments
 (0)