Skip to content

Commit

Permalink
Merge pull request #648 from jGaboardi/versioneer_
Browse files Browse the repository at this point in the history
Versioneer
  • Loading branch information
jGaboardi authored Sep 11, 2021
2 parents 888047b + 564f1e6 commit 7838510
Show file tree
Hide file tree
Showing 7 changed files with 2,797 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.ipynb linguist-language=Python
spaghetti/_version.py export-subst
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include LICENSE.txt CHANGELOG.md MANIFEST.in requirements_notebooks_conda.txt requirements_notebooks_pypi.txt requirements_dev.txt requirements_docs.txt requirements_plus.txt requirements_tests.txt requirements.txt
include versioneer.py
include spaghetti/_version.py
7 changes: 7 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[versioneer]
VCS = git
style = pep440
versionfile_source = spaghetti/_version.py
versionfile_build = spaghetti/_version.py
tag_prefix = v
parentdir_prefix = spaghetti-
9 changes: 3 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
from distutils.command.build_py import build_py
from setuptools import setup
import versioneer

package = "spaghetti"

# Get __version__ from package/__init__.py
with open(package + "/__init__.py", "r") as f:
exec(f.readline())

description = "Analysis of Network-constrained Spatial Data"

# Fetch README.md for the `long_description`
Expand Down Expand Up @@ -57,7 +54,8 @@ def setup_package():

setup(
name=package,
version=__version__,
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass({"build_py": build_py}),
description=description,
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down Expand Up @@ -85,7 +83,6 @@ def setup_package():
install_requires=install_reqs,
extras_require=extras_reqs,
zip_safe=False,
cmdclass={"build.py": build_py},
python_requires=">=3.7",
)

Expand Down
6 changes: 4 additions & 2 deletions spaghetti/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
__version__ = "1.6.2"

"""
# `spaghetti` --- Spatial Graphs: Networks, Topology, & Inference
"""

from .network import Network, PointPattern, SimulatedPointPattern
from .network import extract_component, spanning_tree
from .network import element_as_gdf, regular_lattice

from . import _version

__version__ = _version.get_versions()["version"]
Loading

0 comments on commit 7838510

Please sign in to comment.