Skip to content

Commit a614fe3

Browse files
authored
Setup.py Fixes (#83)
* setup.py: use '>=' not '==' when reading in requirements.txt * misc * increment to version 1.5.1 * make schema visible at the module level * add 'file_catalog.schema' to setup.py (not in __init__.py) * add py.typed to enable mypy when importing this as a package * try w/o 'file_catalog.schema' * Revert "try w/o 'file_catalog.schema'" This reverts commit 77fd97b. * relax rest-tools requirement * try w/o git+ * try w/o egg
1 parent 25080a2 commit a614fe3

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

file_catalog/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"""Init."""
2+
13
from __future__ import absolute_import, division, print_function
24

35
# version is a human-readable version number.
@@ -7,5 +9,5 @@
79
# is zero for an official release, positive for a development branch,
810
# or negative for a release candidate or beta (after the base version
911
# number has been incremented)
10-
__version__ = '1.5.0'
11-
version_info = (1, 5, 0, 0)
12+
__version__ = "1.5.1"
13+
version_info = (1, 5, 1, 0)

file_catalog/py.typed

Whitespace-only changes.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ requests-futures==1.0.0
3131
requests-mock==1.7.0
3232
requests-toolbelt==0.9.1
3333
requests==2.22.0
34-
rest-tools @ git+https://github.com/WIPACrepo/rest-tools@981c683c683c9b92f750753a126803c79db0edd2#egg=rest_tools
34+
rest_tools @ git+http://github.com/WIPACrepo/rest-tools
3535
six==1.12.0
3636
snowballstemmer==2.0.0
3737
Sphinx==2.2.0

setup.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
import sys
2-
from setuptools import setup
1+
"""Setup."""
2+
3+
# fmt:off
4+
# pylint: skip-file
5+
36
from os import path
47

8+
from setuptools import setup # type: ignore[import]
9+
10+
# local imports
511
import file_catalog
612

713
here = path.abspath(path.dirname(__file__))
814

915
long_description = open(path.join(here, 'README.md')).read()
10-
install_requires = [l.strip() for l in open(path.join(here, 'requirements.txt'))]
16+
install_requires = [
17+
m.strip().replace('==', '>=') for m in open(path.join(here, 'requirements.txt'))
18+
]
1119

1220
setup(
1321
name='file_catalog',
@@ -28,10 +36,10 @@
2836
'Programming Language :: Python :: 3.6',
2937
],
3038
keywords='file catalog',
31-
packages=['file_catalog'],
39+
packages=['file_catalog', 'file_catalog.schema'],
3240
install_requires=install_requires,
3341
package_data={
34-
'file_catalog':['data/www/*','data/www_templates/*'],
42+
'file_catalog': ['data/www/*', 'data/www_templates/*', 'py.typed'],
3543
},
3644
entry_points={
3745
'console_scripts':[

0 commit comments

Comments
 (0)