Skip to content

Commit

Permalink
Merge 5f9b1c7 into 3373c6b
Browse files Browse the repository at this point in the history
  • Loading branch information
hakonanes committed Jan 4, 2020
2 parents 3373c6b + 5f9b1c7 commit e9041b7
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
with open("kikuchipy/release.py") as fid:
for line in fid:
if line.startswith("author"):
author = line.strip().split(" = ")[-1][1:-1]
AUTHOR = line.strip().split(" = ")[-1][1:-1]
elif line.startswith("maintainer_email"): # Must be before 'maintainer'
maintainer_email = line.strip(" = ").split()[-1][1:-1]
MAINTAINER_EMAIL = line.strip(" = ").split()[-1][1:-1]
elif line.startswith("maintainer"):
maintainer = line.strip().split(" = ")[-1][1:-1]
MAINTAINER = line.strip().split(" = ")[-1][1:-1]
elif line.startswith("name"):
name = line.strip().split()[-1][1:-1]
NAME = line.strip().split()[-1][1:-1]
elif line.startswith("version"):
version = line.strip().split(" = ")[-1][1:-1]
VERSION = line.strip().split(" = ")[-1][1:-1]
elif line.startswith("license"):
license = line.strip().split(" = ")[-1][1:-1]
LICENSE = line.strip().split(" = ")[-1][1:-1]

# Projects with optional features for building the documentation and running
# tests. From setuptools:
Expand All @@ -58,17 +58,17 @@
] + list(chain(*list(extra_feature_requirements.values())))

setup(
name=name,
version=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=author,
author_email=maintainer_email,
maintainer=maintainer,
maintainer_email=maintainer_email,
author=AUTHOR,
author_email=MAINTAINER_EMAIL,
maintainer=MAINTAINER,
maintainer_email=MAINTAINER_EMAIL,
keywords=[
"EBSD",
"electron backscatter diffraction",
Expand Down Expand Up @@ -106,7 +106,7 @@
extras_require=extra_feature_requirements,
packages=find_packages(),
package_dir={"kikuchipy": "kikuchipy"},
license=license,
license=LICENSE,
entry_points={"hyperspy.extensions": "kikuchipy = kikuchipy"},
python_requires=">=3.7",
)

0 comments on commit e9041b7

Please sign in to comment.