Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
backup/llf
/doc/build/
*/__pycache__/*
__pycache__/
build/
easyreg.egg-info/
/training_atlas_ll3/
/training_atlas/
./RELEASE-VERSION
Expand Down
31 changes: 4 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,12 @@ jobs:
# - CXX=clang++


install:
# Create a new environment
- conda create --yes --name test python=$TRAVIS_PYTHON_VERSION
# Activate it
- source activate test
# Install various dependencies
- conda install --yes numpy=1.17 pytest pip

install:
- conda install --yes conda-build
# You can add any CONDA channels you may need here. CONDA supports
# both the commands add and append. The only difference is that
# the add command places the channel at the front of the priority
# list, while append does the opposite.
- conda config --add channels pytorch
- conda config --add channels conda-forge
- conda config --add channels anaconda
- conda config --add channels uncbiag
- conda install easyreg

# Build the conda recipe for this package
- conda build . --python=$TRAVIS_PYTHON_VERSION --output-folder bld-dir
# Add the built package as a channel with highest priority
- conda config --add channels "file://`pwd`/bld-dir"

# Create and activate the test environment
- conda create --yes --name test-environment python=$TRAVIS_PYTHON_VERSION easyreg --file dev-requirements.txt
- source activate test-environment

- which python
- pip wheel . --index-url https://test.pypi.org/simple --extra-index-url https://pypi.org/simple -w dist
- pip install --index-url https://test.pypi.org/simple --extra-index-url https://pypi.org/simple dist/easyreg*


# command to install dependencies
#install:
Expand Down
2 changes: 0 additions & 2 deletions bld.bat

This file was deleted.

10 changes: 0 additions & 10 deletions build.sh

This file was deleted.

24 changes: 0 additions & 24 deletions conda_build_config.yaml

This file was deleted.

74 changes: 0 additions & 74 deletions meta.yaml

This file was deleted.

1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ torchvision
sklearn
gdown
nose
mermaid
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"nibabel",
"webcolors",
"sklearn",
"gdown"
"gdown",
"mermaid"
]

# What packages are optional?
Expand Down Expand Up @@ -144,7 +145,7 @@ def run(self):
classifiers=[
# Trove classifiers
# Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
'License :: OSI Approved :: Apache 2.0 License',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
Expand Down
1 change: 1 addition & 0 deletions travis_test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cd test_models
which python
# this requires GPU support
#gdown https://drive.google.com/uc?id=1RI7YevByrLAKy1JTv6KG4RSAnHIC7ybb
#unzip demo.zip -d .
Expand Down
1 change: 1 addition & 0 deletions version.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def call_git_describe(abbrev):


def is_dirty():
return False
try:
p = Popen(["git", "diff-index", "--name-only", "HEAD"],
stdout=PIPE, stderr=PIPE)
Expand Down