Skip to content

Commit 536458e

Browse files
authored
Merge pull request #26 from ghisvail/mnt/flit-scm
[MNT] Use flit-scm to package the project
2 parents c0be205 + 9ceaf9d commit 536458e

File tree

9 files changed

+79
-2534
lines changed

9 files changed

+79
-2534
lines changed

.github/workflows/pythonpackage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ jobs:
9292
with:
9393
python-version: ${{ matrix.python-version }}
9494
- name: Install build tools
95-
run: python -m pip install --upgrade pip setuptools wheel twine
95+
run: python -m pip install build twine
9696
- name: Build source and wheel distributions
97-
run: python setup.py sdist bdist_wheel
97+
run: python -m build
9898
- name: Check distributions
9999
run: twine check dist/*
100100
- uses: actions/upload-artifact@v2

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,6 @@ dmypy.json
127127

128128
# Pyre type checker
129129
.pyre/
130+
131+
# Generated by flit_scm
132+
_versions.py

MANIFEST.in

Lines changed: 0 additions & 2 deletions
This file was deleted.

pydra/tasks/nipype1/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
from ._version import get_versions
2-
3-
__version__ = get_versions()["version"]
4-
del get_versions
1+
"""
2+
>>> from pydra import ShellCommandTask
3+
>>> import pydra.tasks.nipype1
4+
"""
5+
try:
6+
from ._version import __version__
7+
except ImportError:
8+
pass

0 commit comments

Comments
 (0)