Skip to content

Commit 7fc024c

Browse files
committed
CLN: Replaced package list with find_packages
1 parent 2c903d5 commit 7fc024c

File tree

5 files changed

+17
-95
lines changed

5 files changed

+17
-95
lines changed

ci/environment-dev.yaml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

doc/source/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ installed), make sure you have `pytest
198198
Dependencies
199199
------------
200200

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

doc/source/whatsnew/v0.22.0.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,13 @@ Other API Changes
128128
- Restricted ``DateOffset`` keyword arguments. Previously, ``DateOffset`` subclasses allowed arbitrary keyword arguments which could lead to unexpected behavior. Now, only valid arguments will be accepted. (:issue:`17176`, :issue:`18226`).
129129
- :func:`DataFrame.from_items` provides a more informative error message when passed scalar values (:issue:`17312`)
130130
- When created with duplicate labels, ``MultiIndex`` now raises a ``ValueError``. (:issue:`17464`)
131+
132+
Development Requirements
133+
~~~~~~~~~~~~~~~~~~~~~~~~
134+
135+
131136
- Building from source now explicity requires ``setuptools`` in ``setup.py`` (:issue:`18113`)
137+
- Refactored ``setup.py`` to use ``find_packages`` instead of explicitly listing out all subpackages (:issue:`18535`)
132138

133139
.. _whatsnew_0220.deprecations:
134140

setup.py

Lines changed: 7 additions & 91 deletions
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
@@ -712,96 +712,12 @@ def pxd(name):
712712
setup(name=DISTNAME,
713713
maintainer=AUTHOR,
714714
version=versioneer.get_version(),
715-
packages=['pandas',
716-
'pandas.api',
717-
'pandas.api.types',
718-
'pandas.compat',
719-
'pandas.compat.numpy',
720-
'pandas.core',
721-
'pandas.core.dtypes',
722-
'pandas.core.indexes',
723-
'pandas.core.computation',
724-
'pandas.core.reshape',
725-
'pandas.core.sparse',
726-
'pandas.core.tools',
727-
'pandas.core.util',
728-
'pandas.computation',
729-
'pandas.errors',
730-
'pandas.formats',
731-
'pandas.io',
732-
'pandas.io.json',
733-
'pandas.io.sas',
734-
'pandas.io.msgpack',
735-
'pandas.io.formats',
736-
'pandas.io.clipboard',
737-
'pandas._libs',
738-
'pandas._libs.tslibs',
739-
'pandas.plotting',
740-
'pandas.stats',
741-
'pandas.types',
742-
'pandas.util',
743-
'pandas.tests',
744-
'pandas.tests.api',
745-
'pandas.tests.dtypes',
746-
'pandas.tests.computation',
747-
'pandas.tests.sparse',
748-
'pandas.tests.frame',
749-
'pandas.tests.generic',
750-
'pandas.tests.indexing',
751-
'pandas.tests.indexes',
752-
'pandas.tests.indexes.datetimes',
753-
'pandas.tests.indexes.timedeltas',
754-
'pandas.tests.indexes.period',
755-
'pandas.tests.internals',
756-
'pandas.tests.io',
757-
'pandas.tests.io.json',
758-
'pandas.tests.io.parser',
759-
'pandas.tests.io.sas',
760-
'pandas.tests.io.msgpack',
761-
'pandas.tests.io.formats',
762-
'pandas.tests.groupby',
763-
'pandas.tests.reshape',
764-
'pandas.tests.series',
765-
'pandas.tests.scalar',
766-
'pandas.tests.tseries',
767-
'pandas.tests.tseries.offsets',
768-
'pandas.tests.plotting',
769-
'pandas.tests.tools',
770-
'pandas.tests.util',
771-
'pandas.tools',
772-
'pandas.tseries',
773-
],
774-
package_data={'pandas.tests': ['data/*.csv'],
775-
'pandas.tests.indexes': ['data/*.pickle'],
776-
'pandas.tests.io': ['data/legacy_hdf/*.h5',
777-
'data/legacy_pickle/*/*.pickle',
778-
'data/legacy_msgpack/*/*.msgpack',
779-
'data/*.csv*',
780-
'data/*.dta',
781-
'data/*.pickle',
782-
'data/*.txt',
783-
'data/*.xls',
784-
'data/*.xlsx',
785-
'data/*.xlsm',
786-
'data/*.table',
787-
'parser/data/*.csv',
788-
'parser/data/*.gz',
789-
'parser/data/*.bz2',
790-
'parser/data/*.txt',
791-
'parser/data/*.tar',
792-
'parser/data/*.zip',
793-
'parser/data/*.tar.gz',
794-
'sas/data/*.csv',
795-
'sas/data/*.xpt',
796-
'sas/data/*.sas7bdat',
797-
'data/*.html',
798-
'data/html_encoding/*.html',
799-
'json/data/*.json*'],
800-
'pandas.tests.io.formats': ['data/*.csv'],
801-
'pandas.tests.io.msgpack': ['data/*.mp'],
802-
'pandas.tests.reshape': ['data/*.csv'],
803-
'pandas.tests.tseries.offsets': ['data/*.pickle'],
804-
'pandas.io.formats': ['templates/*.tpl']
715+
packages=find_packages(include=['pandas', 'pandas.*']),
716+
package_data={'pandas': ['*.csv', '*.pickle', '*.msgpack', '*.h5',
717+
'*.dta', '*.txt', '*.xls', '*.xlsx', '*.xlsm',
718+
'*.table', '*.gz', '*.bz2', '*.tar', '*.zip',
719+
'.*tar.gz', '*.xpt', '*.sas7bdat', '*.html',
720+
'*.json', '*.mp', '*.tpl']
805721
},
806722
ext_modules=extensions,
807723
maintainer_email=EMAIL,

0 commit comments

Comments
 (0)