NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commitc60df5e

committed

In setup.py, inline the packages that need to be installed into setup().

... instead of hiding that behind a function call in setupext.Also always install the test source files -- setting `tests = False` insetup.cfg now only ignores the test data (this is also consistent withthe contents of `matplotlib/tests/__init__.py which is clearly intendedto handle the case where the test source files are installed but not thebaseline images). This is done for simplicity of implementation andalso to make it possibly easier to separately install the baselineimages (as these are now pure "data") in the future.

1 parent7422347 commitc60df5eCopy full SHA for c60df5e

File tree

2 files changed

-52

lines changed

2 files changed

-52

lines changed

`‎setup.py‎`

Lines changed: 7 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`importos`
`24`	`24`	`fromzipfileimportZipFile`
`25`	`25`
`26`		`-fromsetuptoolsimportsetup,Extension`
	`26`	`+fromsetuptoolsimportsetup,find_packages,Extension`
`27`	`27`	`fromsetuptools.command.build_extimportbuild_extasBuildExtCommand`
`28`	`28`	`fromsetuptools.command.developimportdevelopasDevelopCommand`
`29`	`29`	`fromsetuptools.command.install_libimportinstall_libasInstallLibCommand`
`@@ -169,12 +169,7 @@ def run(self):`
`169`	`169`	`# however, this is needed on Windows to avoid creating infinite subprocesses`
`170`	`170`	`# when using multiprocessing.`
`171`	`171`	`if__name__=='__main__':`
`172`		`-# These are distutils.setup parameters that the various packages add`
`173`		`-# things to.`
`174`		`-packages= []`
`175`		`-namespace_packages= []`
`176`		`-py_modules= []`
`177`		`-package_data= {}`
	`172`	`+package_data= {}# Will be filled below by the various components.`
`178`	`173`
`179`	`174`	`# If the user just queries for information, don't bother figuring out which`
`180`	`175`	`# packages to build or install.`
`@@ -224,9 +219,6 @@ def run(self):`
`224`	`219`	`# Now collect all of the information we need to build all of the`
`225`	`220`	`# packages.`
`226`	`221`	`forpackageingood_packages:`
`227`		`-packages.extend(package.get_packages())`
`228`		`-namespace_packages.extend(package.get_namespace_packages())`
`229`		`-py_modules.extend(package.get_py_modules())`
`230`	`222`	`# Extension modules only get added in build_ext, as numpy will have`
`231`	`223`	`# been installed (as setup_requires) at that point.`
`232`	`224`	`data=package.get_package_data()`
`@@ -267,14 +259,14 @@ def run(self):`
`267`	`259`	`interfaces and hardcopy output formats.`
`268`	`260`	`""",`
`269`	`261`	`license="PSF",`
`270`		`-packages=packages,`
`271`		`-namespace_packages=namespace_packages,`
`272`		`-platforms='any',`
`273`		`-py_modules=py_modules,`
	`262`	`+platforms="any",`
	`263`	`+package_dir={"":"lib"},`
	`264`	`+packages=find_packages("lib"),`
	`265`	`+namespace_packages=["mpl_toolkits"],`
	`266`	`+py_modules=["pylab"],`
`274`	`267`	`# Dummy extension to trigger build_ext, which will swap it out with`
`275`	`268`	`# real extensions that can depend on numpy for the build.`
`276`	`269`	`ext_modules=[Extension("", [])],`
`277`		`-package_dir={"":"lib"},`
`278`	`270`	`package_data=package_data,`
`279`	`271`	`classifiers=classifiers,`
`280`	`272`

`‎setupext.py‎`

Lines changed: 0 additions & 37 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`importos`
`9`	`9`	`importpathlib`
`10`	`10`	`importplatform`
`11`		`-importsetuptools`
`12`	`11`	`importshlex`
`13`	`12`	`importshutil`
`14`	`13`	`importsubprocess`
`@@ -310,30 +309,6 @@ def check(self):`
`310`	`309`	`"""`
`311`	`310`	`pass`
`312`	`311`
`313`		`-defget_packages(self):`
`314`		`-"""`
`315`		`- Get a list of package names to add to the configuration.`
`316`		- These are added to the `packages` list passed to
`317`		- `distutils.setup`.
`318`		`- """`
`319`		`-return []`
`320`		`-`
`321`		`-defget_namespace_packages(self):`
`322`		`-"""`
`323`		`- Get a list of namespace package names to add to the configuration.`
`324`		- These are added to the `namespace_packages` list passed to
`325`		- `distutils.setup`.
`326`		`- """`
`327`		`-return []`
`328`		`-`
`329`		`-defget_py_modules(self):`
`330`		`-"""`
`331`		`- Get a list of top-level modules to add to the configuration.`
`332`		- These are added to the `py_modules` list passed to
`333`		- `distutils.setup`.
`334`		`- """`
`335`		`-return []`
`336`		`-`
`337`	`312`	`defget_package_data(self):`
`338`	`313`	`"""`
`339`	`314`	`Get a package data dictionary to add to the configuration.`
`@@ -485,15 +460,6 @@ class Matplotlib(SetupPackage):`
`485`	`460`	`defcheck(self):`
`486`	`461`	`returnversioneer.get_version()`
`487`	`462`
`488`		`-defget_packages(self):`
`489`		`-returnsetuptools.find_packages("lib",exclude=["*.tests"])`
`490`		`-`
`491`		`-defget_namespace_packages(self):`
`492`		`-return ['mpl_toolkits']`
`493`		`-`
`494`		`-defget_py_modules(self):`
`495`		`-return ['pylab']`
`496`		`-`
`497`	`463`	`defget_package_data(self):`
`498`	`464`	`return {`
`499`	`465`	`'matplotlib': [`
`@@ -525,9 +491,6 @@ class Tests(OptionalPackage):`
`525`	`491`	`name="tests"`
`526`	`492`	`default_config=False`
`527`	`493`
`528`		`-defget_packages(self):`
`529`		`-returnsetuptools.find_packages("lib",include=["*.tests"])`
`530`		`-`
`531`	`494`	`defget_package_data(self):`
`532`	`495`	`return {`
`533`	`496`	`'matplotlib': [`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc60df5e

File tree

2 files changed

2 files changed

`‎setup.py‎`

`‎setupext.py‎`

0 commit comments