Skip to content

Commit f7eb4ae

Browse files
WillAydjreback
authored andcommitted
CLN: Replaced package list with find_packages (#18632)
1 parent 0ebdc10 commit f7eb4ae

File tree

6 files changed

+10
-97
lines changed

6 files changed

+10
-97
lines changed

ci/environment-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ dependencies:
1010
- python-dateutil>=2.5.0
1111
- python=3
1212
- pytz
13-
- setuptools
13+
- setuptools>=3.3
1414
- sphinx

ci/requirements_dev.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ moto
66
pytest>=3.1
77
python-dateutil>=2.5.0
88
pytz
9-
setuptools
10-
sphinx
9+
setuptools>=3.3
10+
sphinx

conda.recipe/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ requirements:
1515
- python
1616
- cython
1717
- numpy x.x
18-
- setuptools
18+
- setuptools >=3.3
1919

2020
run:
2121
- python

doc/source/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ installed), make sure you have `pytest
194194
Dependencies
195195
------------
196196

197-
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
197+
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__: 3.3.0 or higher
198198
* `NumPy <http://www.numpy.org>`__: 1.9.0 or higher
199199
* `python-dateutil <//https://dateutil.readthedocs.io/en/stable/>`__: 2.5.0 or higher
200200
* `pytz <http://pytz.sourceforge.net/>`__

doc/source/whatsnew/v0.22.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ Other API Changes
186186
- :func:`Series.fillna` now raises a ``TypeError`` instead of a ``ValueError`` when passed a list, tuple or DataFrame as a ``value`` (:issue:`18293`)
187187
- :func:`pandas.DataFrame.merge` no longer casts a ``float`` column to ``object`` when merging on ``int`` and ``float`` columns (:issue:`16572`)
188188
- The default NA value for :class:`UInt64Index` has changed from 0 to ``NaN``, which impacts methods that mask with NA, such as ``UInt64Index.where()`` (:issue:`18398`)
189+
- Refactored ``setup.py`` to use ``find_packages`` instead of explicitly listing out all subpackages (:issue:`18535`)
189190

190191
.. _whatsnew_0220.deprecations:
191192

setup.py

+4-92
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import sys
1414
import shutil
1515
from distutils.version import LooseVersion
16-
from setuptools import setup, Command
16+
from setuptools import setup, Command, find_packages
1717

1818
# versioning
1919
import versioneer
@@ -716,100 +716,12 @@ def pxd(name):
716716
setup(name=DISTNAME,
717717
maintainer=AUTHOR,
718718
version=versioneer.get_version(),
719-
packages=['pandas',
720-
'pandas.api',
721-
'pandas.api.types',
722-
'pandas.compat',
723-
'pandas.compat.numpy',
724-
'pandas.core',
725-
'pandas.core.dtypes',
726-
'pandas.core.indexes',
727-
'pandas.core.computation',
728-
'pandas.core.reshape',
729-
'pandas.core.sparse',
730-
'pandas.core.tools',
731-
'pandas.core.util',
732-
'pandas.computation',
733-
'pandas.errors',
734-
'pandas.formats',
735-
'pandas.io',
736-
'pandas.io.json',
737-
'pandas.io.sas',
738-
'pandas.io.msgpack',
739-
'pandas.io.formats',
740-
'pandas.io.clipboard',
741-
'pandas._libs',
742-
'pandas._libs.tslibs',
743-
'pandas.plotting',
744-
'pandas.stats',
745-
'pandas.types',
746-
'pandas.util',
747-
'pandas.tests',
748-
'pandas.tests.api',
749-
'pandas.tests.dtypes',
750-
'pandas.tests.categorical',
751-
'pandas.tests.computation',
752-
'pandas.tests.sparse',
753-
'pandas.tests.frame',
754-
'pandas.tests.generic',
755-
'pandas.tests.indexing',
756-
'pandas.tests.indexes',
757-
'pandas.tests.indexes.datetimes',
758-
'pandas.tests.indexes.timedeltas',
759-
'pandas.tests.indexes.period',
760-
'pandas.tests.internals',
761-
'pandas.tests.io',
762-
'pandas.tests.io.json',
763-
'pandas.tests.io.parser',
764-
'pandas.tests.io.sas',
765-
'pandas.tests.io.msgpack',
766-
'pandas.tests.io.formats',
767-
'pandas.tests.groupby',
768-
'pandas.tests.reshape',
769-
'pandas.tests.reshape.merge',
770-
'pandas.tests.series',
771-
'pandas.tests.scalar',
772-
'pandas.tests.tseries',
773-
'pandas.tests.tseries.offsets',
774-
'pandas.tests.plotting',
775-
'pandas.tests.tools',
776-
'pandas.tests.util',
777-
'pandas.tools',
778-
'pandas.tseries',
779-
],
780-
package_data={'pandas.tests': ['data/*.csv'],
781-
'pandas.tests.indexes': ['data/*.pickle'],
719+
packages=find_packages(include=['pandas', 'pandas.*']),
720+
package_data={'': ['data/*', 'templates/*'],
782721
'pandas.tests.io': ['data/legacy_hdf/*.h5',
783722
'data/legacy_pickle/*/*.pickle',
784723
'data/legacy_msgpack/*/*.msgpack',
785-
'data/*.csv*',
786-
'data/*.dta',
787-
'data/*.pickle',
788-
'data/*.txt',
789-
'data/*.xls',
790-
'data/*.xlsx',
791-
'data/*.xlsm',
792-
'data/*.table',
793-
'parser/data/*.csv',
794-
'parser/data/*.gz',
795-
'parser/data/*.bz2',
796-
'parser/data/*.txt',
797-
'parser/data/*.tar',
798-
'parser/data/*.zip',
799-
'parser/data/*.tar.gz',
800-
'sas/data/*.csv',
801-
'sas/data/*.xpt',
802-
'sas/data/*.sas7bdat',
803-
'data/*.html',
804-
'data/html_encoding/*.html',
805-
'json/data/*.json*'],
806-
'pandas.tests.io.formats': ['data/*.csv'],
807-
'pandas.tests.io.msgpack': ['data/*.mp'],
808-
'pandas.tests.reshape': ['data/*.csv'],
809-
'pandas.tests.reshape.merge': ['data/*.csv'],
810-
'pandas.tests.tseries.offsets': ['data/*.pickle'],
811-
'pandas.io.formats': ['templates/*.tpl']
812-
},
724+
'data/html_encoding/*.html']},
813725
ext_modules=extensions,
814726
maintainer_email=EMAIL,
815727
description=DESCRIPTION,

0 commit comments

Comments
 (0)