Skip to content

Commit ecea0c5

Browse files
committed
Merge branch 'issue57' into 'master'
Add a pyproject.toml which forces a compatible version of setuptools Closes python#57 See merge request python-devs/importlib_resources!61
2 parents cd75e0f + 0d14b9a commit ecea0c5

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include *.py MANIFEST.in LICENSE README.rst
2-
global-include *.txt *.rst *.ini *.cfg
2+
global-include *.txt *.rst *.ini *.cfg *.toml
33
exclude .gitignore .tox
44
prune build

README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ solution in Python's stdlib that relies on well-defined APIs. This makes
1515
reading resources included in packages easier, with more stable and consistent
1616
semantics.
1717

18+
Note that ``pip 10`` is required if you are going to ``pip install
19+
importlib_resources``.
20+
1821

1922
Project details
2023
===============

importlib_resources/docs/changelog.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
importlib_resources NEWS
33
==========================
44

5-
1.0 (2018-XX-XX)
5+
0.8 (2018-XX-XX)
66
================
77
* Strip ``importlib_resources.__version__``. Closes #56
8+
* Fix a metadata problem with older setuptools. Closes #57
89

910
0.7 (2018-05-15)
1011
================

importlib_resources/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7
1+
0.8

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[build-system]
2+
requires = ["setuptools>=30.3"]

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ install_requires =
2727
packages = find:
2828

2929
[options.package_data]
30-
* = *.zip, *.file, *.txt
30+
* = *.zip, *.file, *.txt, *.toml
3131
importlib_resources =
3232
docs/*
3333
docs/_static/*

0 commit comments

Comments
 (0)