Skip to content

Commit

Permalink
Merge pull request #2575 from djhoese/remove-scm-git
Browse files Browse the repository at this point in the history
  • Loading branch information
djhoese committed Sep 21, 2023
2 parents 214e3f4 + 72bdca2 commit fd51886
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/deploy-sdist.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Deploy sdist

on:
push:
pull_request:
release:
types:
- published
Expand All @@ -15,7 +17,9 @@ jobs:

- name: Create sdist
shell: bash -l {0}
run: python setup.py sdist
run: |
python -m pip install -q build
python -m build -s
- name: Publish package to PyPI
if: github.event.action == 'published'
Expand Down
16 changes: 13 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
include doc/Makefile
include doc/source/*
include doc/examples/*.py
prune *
exclude *
graft doc
recursive-exclude doc/build *
graft satpy
include LICENSE.txt
include README.rst
include AUTHORS.md
include CHANGELOG.md
include SECURITY.md
include CITATION
include satpy/version.py
include pyproject.toml
include setup.py
include setup.cfg
global-exclude *.py[cod]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.2", 'setuptools_scm_git_archive']
requires = ["setuptools>=60", "wheel", "setuptools_scm[toml]>=8.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
Expand Down
8 changes: 0 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@

from setuptools import find_packages, setup

try:
# HACK: https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286
# Stop setuptools_scm from including all repository files
import setuptools_scm.integration
setuptools_scm.integration.find_files = lambda _: []
except ImportError:
pass

requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.24.0', 'trollsift',
'trollimage >=1.20', 'pykdtree', 'pyyaml >=5.1', 'xarray >=0.10.1, !=0.13.0',
'dask[array] >=0.17.1', 'pyproj>=2.2', 'zarr', 'donfig', 'appdirs',
Expand Down

0 comments on commit fd51886

Please sign in to comment.