Merge pull request #141 from djhoese/versioning-setuptools-scm

pearu · Dec 13, 2022 · 19170fa · 19170fa
2 parents 28bb051 + 7cc650b
commit 19170fa
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 333 deletions.
diff --git a/.git_archival.txt b/.git_archival.txt
@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true)$
+ref-names: $Format:%D$
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.git_archival.txt  export-subst
diff --git a/.github/workflows/deploy-sdist.yaml b/.github/workflows/deploy-sdist.yaml
@@ -15,7 +15,9 @@ jobs:
 
       - name: Create sdist
         shell: bash -l {0}
-        run: python setup.py sdist
+        run: |
+          pip install build
+          python -m build -s
 
       - name: Publish package to PyPI
         if: github.event.action == 'published'

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 build
+dist
 *.egg-info
 *.pyc
 *.pyd
+__pycache__
 libtiff/version.py
-
+*.so
diff --git a/libtiff/__init__.py b/libtiff/__init__.py
@@ -19,6 +19,13 @@
 __all__ = ['TIFF', 'TIFF3D', 'TIFFfile', 'TiffArray', 'TiffFile',
            'TiffFiles', 'TiffChannelsAndFiles', 'TiffBase']
 
+try:
+    from libtiff.version import version as __version__  # noqa
+except ModuleNotFoundError:
+    raise ModuleNotFoundError(
+        "No module named libtiff.version. This could mean "
+        "you didn't install 'pylibtiff' properly. Try reinstalling ('pip "
+        "install').")
 
 from .libtiff_ctypes import libtiff, TIFF, TIFF3D  # noqa: F401
 from .tiff import TIFFfile, TIFFimage, TiffArray   # noqa: F401

diff --git a/libtiff/scripts/convert.py b/libtiff/scripts/convert.py
@@ -6,9 +6,6 @@
 
 import os
 
-### START UPDATE SYS.PATH ###
-### END UPDATE SYS.PATH ###
-
 description_template = '''
 DimensionX: %(DimensionX)s
 DimensionY: %(DimensionY)s

diff --git a/libtiff/scripts/info.py b/libtiff/scripts/info.py
@@ -6,9 +6,6 @@
 
 import os  # noqa: F401
 
-### START UPDATE SYS.PATH ###
-### END UPDATE SYS.PATH ###
-
 
 def runner(parser, options, args):
 

diff --git a/libtiff/setup.py b/libtiff/setup.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,7 @@
+[build-system]
+requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive', 'oldest-supported-numpy']
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+write_to = "libtiff/version.py"
+
diff --git a/setup.cfg b/setup.cfg
@@ -4,3 +4,8 @@ max-line-length = 120
 # Ignore all docstring errors for now
 ignore = D
 
+[coverage:run]
+relative_files = True
+omit =
+    libtiff/version.py
+    libtiff/tiff_h_*.py