diff --git a/.travis.yml b/.travis.yml index bb01891..cfb6bdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ install: script: - python setup.py test - if [[ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]]; then pre-commit run --all-files; fi - - env deploy: provider: pypi user: "__token__" diff --git a/requirements.in b/requirements.in index 0dc72dd..c236f6d 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ reportlab -Pillow<6 # pillow 6 is not supported by reportlab +Pillow pre-commit pytest diff --git a/requirements.txt b/requirements.txt index b6f3d98..3119c3a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,27 +2,26 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile +# pip-compile requirements.in # aspy.yaml==1.3.0 # via pre-commit -atomicwrites==1.3.0 # via pytest -attrs==19.1.0 # via pytest +attrs==19.3.0 # via pytest cfgv==2.0.1 # via pre-commit -identify==1.4.7 # via pre-commit -importlib-metadata==0.23 # via pluggy, pre-commit, pytest -more-itertools==7.2.0 # via pytest, zipp +identify==1.4.8 # via pre-commit +importlib-metadata==1.2.0 # via pluggy, pre-commit, pytest +more-itertools==8.0.2 # via pytest, zipp nodeenv==1.3.3 # via pre-commit packaging==19.2 # via pytest -pillow==5.4.1 -pluggy==0.13.0 # via pytest -pre-commit==1.18.3 +pillow==6.2.1 +pluggy==0.13.1 # via pytest +pre-commit==1.20.0 py==1.8.0 # via pytest -pyparsing==2.4.2 # via packaging -pytest==5.1.2 -pyyaml==5.1.2 # via aspy.yaml, pre-commit -reportlab==3.5.26 -six==1.12.0 # via cfgv, packaging, pre-commit +pyparsing==2.4.5 # via packaging +pytest==5.3.1 +pyyaml==5.2 # via aspy.yaml, pre-commit +reportlab==3.5.32 +six==1.13.0 # via cfgv, packaging, pre-commit toml==0.10.0 # via pre-commit -virtualenv==16.7.5 # via pre-commit +virtualenv==16.7.8 # via pre-commit wcwidth==0.1.7 # via pytest zipp==0.6.0 # via importlib-metadata diff --git a/setup.py b/setup.py index 7d4125d..98da582 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,13 @@ from setuptools import setup -version = "3.8.5" - setup( name="domdiv", - version=version, entry_points={"console_scripts": ["dominion_dividers = domdiv.main:main"]}, package_dir={"": "src"}, packages=["domdiv"], - install_requires=[ - "reportlab==3.5.26", - "Pillow<6", - ], # pillow 6 is not supported by reportlab - setup_requires=["pytest-runner"], + use_scm_version=True, + setup_requires=["setuptools_scm", "pytest-runner"], + install_requires=["reportlab", "Pillow"], tests_require=["pytest", "six", "pytest-flake8", "pre-commit"], url="http://domtabs.sandflea.org", include_package_data=True, diff --git a/src/domdiv/__init__.py b/src/domdiv/__init__.py index d949528..84b27cb 100644 --- a/src/domdiv/__init__.py +++ b/src/domdiv/__init__.py @@ -1,3 +1,7 @@ -import pkg_resources +from pkg_resources import get_distribution, DistributionNotFound -__version__ = pkg_resources.require("domdiv")[0].version +try: + __version__ = get_distribution("domdiv").version +except DistributionNotFound: + # package is not installed + pass