Skip to content

Commit

Permalink
Merge pull request #1193 from nipreps/maint/cleanup-setuptools-scm-re…
Browse files Browse the repository at this point in the history
…mnants

MAINT: Clean up some ``setuptools_scm`` remnants
  • Loading branch information
oesteban committed Mar 18, 2024
2 parents 2a6793e + 2fa2d83 commit 7347d59
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
11 changes: 5 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,10 @@ jobs:
name: Build Docker image
no_output_timeout: 60m
command: |
python3 -m pip install -U build "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
setuptools_scm_git_archive pip twine docutils
python3 -m pip install hatch
# Get version before making repo dirty
THISVERSION=$( python3 -m setuptools_scm )
THISVERSION=$( python3 -m hatch version )
# Inject MRIQC-WebAPI secret
if [ "${MRIQC_API_SECRET_TOKEN}" != "" ]; then
sed -i -E "s/<secret_token>/$MRIQC_API_SECRET_TOKEN/" mriqc/config.py
Expand Down Expand Up @@ -618,7 +617,7 @@ jobs:

build_docs:
docker:
- image: cimg/python:3.8.5
- image: cimg/python:3.10
environment:
- FSLOUTPUTTYPE: NIFTI
steps:
Expand All @@ -629,8 +628,8 @@ jobs:
- run:
name: Install deps
command: |
pip install -U build "setuptools >= 45" wheel "setuptools_scm >= 6.2" \
setuptools_scm_git_archive pip twine docutils
pip install -U pip hatch docutils
hatch version
pip install .[docs]
- run:
name: Build MRIQC documentation
Expand Down
4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
ref-names: $Format:%D$
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mriqc/_version.py export-subst
.git_archival.txt export-subst
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ packages = ["mriqc"]
## The following two sections configure setuptools_scm in the hatch way

[tool.hatch.version]
validate-bump = true
source = "vcs"
raw-options = { version_scheme = "nipreps-calver" }

Expand Down

0 comments on commit 7347d59

Please sign in to comment.