Skip to content

Commit

Permalink
Merge 33efabf into 54135f5
Browse files Browse the repository at this point in the history
  • Loading branch information
hakonanes committed Dec 21, 2019
2 parents 54135f5 + 33efabf commit 02312f6
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 10 deletions.
2 changes: 1 addition & 1 deletion kikuchipy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
from kikuchipy import io
from kikuchipy.io._io import load

from . import release
from kikuchipy import release

__version__ = release.version
3 changes: 2 additions & 1 deletion kikuchipy/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
copyright = "Copyright 2019, KikuchiPy"
credits = ["Håkon Wiik Ånes", "Tina Bergh"]
license = "GPLv3"
version = "0.1.0"
maintainer = "Håkon Wiik Ånes"
maintainer_email = "hakon.w.anes@ntnu.no"
name = "kikuchipy"
status = "Development"
version = "0.1.0"
2 changes: 2 additions & 0 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ formats: all
python:
version: 3.7
install:
- method: setuptools
path: .
- method: pip
path: .
extra_requirements:
Expand Down
28 changes: 20 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,30 @@

from setuptools import setup, find_packages

import kikuchipy.release as release
# Get release information
with open('kikuchipy/release.py') as fid:
for line in fid:
if line.startswith('author'):
author = line.strip().split(' = ')[-1][1:-1]
elif line.startswith('maintainer_email'): # Must be before 'maintainer'
maintainer_email = line.strip(' = ').split()[-1][1:-1]
elif line.startswith('maintainer'):
maintainer = line.strip().split(' = ')[-1][1:-1]
elif line.startswith('name'):
name = line.strip().split()[-1][1:-1]
elif line.startswith('version'):
version = line.strip().split(' = ')[-1][1:-1]

setup(
name='kikuchipy',
version=release.version,
name=name,
version=version,
description=(
'Processing of electron backscatter diffraction (EBSD) patterns'),
long_description=open('README.md').read(),
long_description_content_type='text/markdown',
author=release.author,
maintainer=release.maintainer,
maintainer_email=release.maintainer_email,
author=author,
maintainer=maintainer,
maintainer_email=maintainer_email,
keywords=[
'EBSD', 'electron backscatter diffraction',
'EBSP', 'electron backscatter pattern',
Expand All @@ -52,8 +64,8 @@
],
packages=find_packages(),
install_requires=[
'dask', 'hyperspy >= 1.5.2', 'h5py', 'matplotlib', 'numpy', 'pyxem',
'scikit-image', 'scikit-learn', 'scipy'],
'dask[array]', 'hyperspy >= 1.5.2', 'h5py', 'matplotlib', 'numpy',
'pyxem >= 0.10', 'scikit-image', 'scikit-learn', 'scipy'],
tests_require=['pytest', 'pytest-cov'],
extras_require={'doc': [
'sphinx >= 1.8', 'sphinx-rtd-theme', 'sphinx-copybutton']},
Expand Down

0 comments on commit 02312f6

Please sign in to comment.