Skip to content

Commit

Permalink
Use find_packages instead of a manual list, and test non-editable ins…
Browse files Browse the repository at this point in the history
…talls. Fixes #121
  • Loading branch information
jamadden committed Sep 8, 2016
1 parent b03a03b commit 6425cbf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install:
- pip install -U tox coveralls
- if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then pip install -U python-memcached; fi
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then pip install -U pylibmc cffi; fi
- pip install -U -e ".[test]"
- pip install -U ".[test]"
- .travis/setup-$ENV.sh
# cache: pip seems not to work if `install` is replaced (https://github.com/travis-ci/travis-ci/issues/3239)
cache:
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
2.0.0b6 (unreleased)
====================

- Nothing changed yet.
- Use ``setuptools.find_packages`` and ``include_package_data`` to
ensure wheels have all the files necessary. This corrects an issue
with the 2.0.0b5 release on PyPI. See :issue:`121` by Carlos Sanchez.


2.0.0b5 (2016-08-24)
Expand Down
13 changes: 3 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

import os
from setuptools import setup
from setuptools import find_packages

doclines = __doc__.split("\n")

Expand Down Expand Up @@ -68,16 +69,8 @@ def read_file(*path):
maintainer_email="shane@willowrise.com",
url="http://relstorage.readthedocs.io/",
keywords="ZODB SQL RDBMS MySQL PostgreSQL Oracle",
packages=[
'relstorage',
'relstorage.adapters',
'relstorage.adapters.tests',
'relstorage.tests',
'relstorage.tests.blob',
],
package_data={
'relstorage': ['component.xml'],
},
packages=find_packages(),
include_package_data=True,
license="ZPL 2.1",
platforms=["any"],
description=doclines[0],
Expand Down

0 comments on commit 6425cbf

Please sign in to comment.