Skip to content
Snippets Groups Projects
Commit a7543878 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

Merge branch 'mnt/packages' into 'master' 

Mnt/packages

See merge request fsl/fslpy!177
parents f6161904 22ccc682
No related branches found
No related tags found
No related merge requests found
Pipeline #4710 passed
Stage: test
Stage: style
Stage: doc
Stage: deploy
Hide whitespace changes
Inline Side-by-side
CHANGELOG.rst
+ 8
− 0
View file @ a7543878
...@@ -29,6 +29,14 @@ Changed ...@@ -29,6 +29,14 @@ Changed
* Internal reorganisation in the :mod:`.idle` module. * Internal reorganisation in the :mod:`.idle` module.
Fixed
^^^^^
* Fixed incorrect usage of ``setuptools.find_packages``, which was causing
unit tests to be installed.
Deprecated Deprecated
^^^^^^^^^^ ^^^^^^^^^^
......
setup.py
+ 1
− 2
View file @ a7543878
...@@ -27,8 +27,7 @@ with open(op.join(basedir, 'requirements.txt'), 'rt') as f: ...@@ -27,8 +27,7 @@ with open(op.join(basedir, 'requirements.txt'), 'rt') as f:
with open(op.join(basedir, 'requirements-extra.txt'), 'rt') as f: with open(op.join(basedir, 'requirements-extra.txt'), 'rt') as f:
extra_requires = {'extras' : [l.strip() for l in f.readlines()]} extra_requires = {'extras' : [l.strip() for l in f.readlines()]}
packages = find_packages( packages = find_packages(include=('fsl', 'fsl.*'))
exclude=('doc', 'tests', 'dist', 'build', 'fslpy.egg-info'))
# Figure out the current fslpy version, as defined in fsl/version.py. We # Figure out the current fslpy version, as defined in fsl/version.py. We
# don't want to import the fsl package, as this may cause build problems. # don't want to import the fsl package, as this may cause build problems.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment