Skip to content

Commit

Permalink
Merge pull request #4 from ericpre/fix_package_metadata
Browse files Browse the repository at this point in the history
Fix package metadata
  • Loading branch information
ericpre committed Oct 29, 2023
2 parents ca239a5 + 81e5c7d commit 9f6edcf
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 2 additions & 0 deletions exspy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
from . import signals
from .misc import material
from ._defaults_parser import preferences
from ._version import __version__


__all__ = [
"__version__",
"components",
"data",
"preferences",
Expand Down
1 change: 1 addition & 0 deletions exspy/_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "0.0.1"
6 changes: 0 additions & 6 deletions exspy/release_info.py

This file was deleted.

4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[build-system]
requires = ["setuptools>=40.8.0", "wheel"]
build-backend = "setuptools.build_meta"

[tool.black]
force-exclude = '''
exspy/misc/eds/ffast_mac.py
Expand Down
23 changes: 11 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@

from setuptools import setup, find_packages

exec(open("exspy/release_info.py").read()) # grab version info

# Projects with optional features for building the documentation and running
# tests. From setuptools:
# https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-extras-optional-features-with-their-own-dependencies

extra_feature_requirements = {
"gui-jupyter": [
Expand All @@ -47,17 +42,21 @@
"pytest-cov >= 2.8.1",
"pytest-xdist",
],
"dev": ["black", "pre-commit >=1.16"],
"all": ["gui-jupyter", "gui-traitsui"],
"dev": ["black"],
"all": ["exspy[gui-jupyter]", "exspy[gui-traitsui]"],
}


version = {}
with open("exspy/_version.py") as fp:
exec(fp.read(), version)


setup(
name=name,
version=version,
description="multi-dimensional diffraction microscopy",
author=author,
license=license,
name="exspy",
version=version["__version__"],
description="EELS and EDS analysis with the HyperSpy framework",
license="LICENSE",
url="https://github.com/pyxem/pyxem",
long_description=open("README.md").read(),
long_description_content_type="text/markdown",
Expand Down

0 comments on commit 9f6edcf

Please sign in to comment.