Skip to content

Commit

Permalink
Merge pull request #578 from ANTsX/v0.5.0
Browse files Browse the repository at this point in the history
antspy to v0.5.0 and bump ants + itk versions to latest commit hashes
  • Loading branch information
cookpa authored Mar 16, 2024
2 parents 63ec454 + 9893405 commit f4dcc3e
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 20 deletions.
2 changes: 1 addition & 1 deletion scripts/clone_itk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi

# cd ./src
itkgit=https://github.com/InsightSoftwareConsortium/ITK.git
itktag=f136bfe8bdb86c068ef1627ca2a5c02d5aa2fa24
itktag=be79ceb0a9343c02dba310f5faee371941f6fa40 # 3-15-24
# if ther is a directory but no git,
# remove it
if [[ -d itksource ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_ANTsPy.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY data\* %USERPROFILE%\.antspy

:: clone ANTs and move all files into library directory
SET antsgit=https://github.com/ANTsX/ANTs.git
SET antstag=276cf0717945d3dd3c4298c607d9d6a788ba574e
SET antstag=6c29d9d1d62f158ca324d5fc8786fffc469998e7
echo "ANTS;%antstag%" REM UNKNOWN: {"type":"Redirect","op":{"text":">>","type":"dgreat"},"file":{"text":"./data/softwareVersions.csv","type":"Word"}}
cd ants\lib
echo "123"
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_ANTsPy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cp data/* ~/.antspy/
# clone ANTs and move all files into library directory

antsgit=https://github.com/ANTsX/ANTs.git
antstag=dfd9e6664f2fc5f0dbd05c6c23d5e4895e82abee
antstag=6c29d9d1d62f158ca324d5fc8786fffc469998e7 # 3-15-24
echo "ANTS;${antstag}" >> ./data/softwareVersions.csv

cd ants/lib # go to lib dir
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_ANTsPy_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cp data/* ~/.antspy/
# clone ANTs and move all files into library directory

antsgit=https://github.com/ANTsX/ANTs.git
antstag=35a76bc6b03a036ff69c5b95d6a2a0a0e601303c
antstag=6c29d9d1d62f158ca324d5fc8786fffc469998e7 # 3-15-24
echo "ANTS;${antstag}" >> ./data/softwareVersions.csv

cd ants/lib # go to lib dir
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_ITK.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
SET CMAKE_BUILD_TYPE=Release

SET itkgit=https://github.com/InsightSoftwareConsortium/ITK.git
SET itktag=v5.3rc03
SET itktag=be79ceb0a9343c02dba310f5faee371941f6fa40

:: if there is a directory but no git, remove it
if exist itksource\ (
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_ITK.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi

#cd ./src
itkgit=https://github.com/InsightSoftwareConsortium/ITK.git
itktag=ce57f309f4f4142b80367fd89a88f8dac9d6943a # update ITK tag 11/21/2022
itktag=be79ceb0a9343c02dba310f5faee371941f6fa40 # 3-15-24
# if there is a directory but no git, remove it
if [[ -d itksource ]]; then
if [[ ! -d itksource/.git ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure_ITK_External_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ ! -d $itkdir ]] ; then
fi
cd $itkdir
itkgit=https://github.com/InsightSoftwareConsortium/ITK.git
itktag=ce57f309f4f4142b80367fd89a88f8dac9d6943a
itktag=be79ceb0a9343c02dba310f5faee371941f6fa40 # 3-15-24
if [[ ! -d ITK ]] ; then
git clone $itkgit
fi
Expand Down
14 changes: 1 addition & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from setuptools.command.build_ext import build_ext

setup_py_dir = os.path.dirname(os.path.realpath(__file__))
version = "0.4.2" # ANTsPy version
version = "0.5.0" # ANTsPy version

if "--weekly" in sys.argv:
sys.argv.remove("--weekly")
Expand Down Expand Up @@ -57,18 +57,6 @@ def run(self):

class CMakeBuild(build_ext):
def run(self):
## Find or Configure VTK ##
# print('Configuring VTK')
# if os.getenv('VTK_DIR'):
# print('Using Local VTK Installation at:\n %s' % os.getenv('VTK_DIR'))
# elif os.path.exists(os.path.join(setup_py_dir, 'vtkbuild')):
# print('Using local VTK already built for this package')
# os.environ['VTK_DIR'] = os.path.join(setup_py_dir, 'vtkbuild')
# else:
# print('No local VTK installation found... Building VTK now...')
# subprocess.check_call(['./scripts/configure_VTK.sh'], cwd=setup_py_dir)
# os.environ['VTK_DIR'] = os.path.join(setup_py_dir, 'vtkbuild')

## Find or Configure ITK ##
print("Configuring ITK")
if os.getenv("ITK_DIR"):
Expand Down

0 comments on commit f4dcc3e

Please sign in to comment.