Skip to content

Commit 8dc7be9

Browse files
committed
Use workaround for conda build (conda/conda#508).
1 parent f3aa952 commit 8dc7be9

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ script:
7777
- conda install --yes conda-build jinja2
7878
- if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then conda install --yes anaconda-client; fi
7979
- conda build conda/ndt.recipe --channel dynd/channel/dev
80-
- rm -rf build dist dynd.ndt.egg-info
80+
- rm -rf build dynd.ndt.egg-info
8181
- conda build conda/nd.recipe --channel dynd/channel/dev
8282
- conda install --yes numpy libdynd --channel dynd/channel/dev
8383
- conda install $(conda build --output conda/ndt.recipe | grep bz2)

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build_script:
2525
- conda install conda-build
2626
- ps: if(-not $env:APPVEYOR_PULL_REQUEST_NUMBER) { conda install anaconda-client }
2727
- conda build conda\ndt.recipe --channel dynd/channel/dev
28-
- rd /q /s build dist dynd.ndt.egg-info
28+
- rd /q /s build dynd.ndt.egg-info
2929
- conda build conda\nd.recipe --channel dynd/channel/dev
3030

3131
on_success:

conda/nd.recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cd %RECIPE_DIR%
22
cd ..\..\
33

4-
python setup.py install --target=nd || exit 1
4+
python setup.py install --target=nd --single-version-externally-managed --record=record.txt || exit 1
55

66
rd /s /q %SP_DIR%\__pycache__
77
rd /s /q %SP_DIR%\numpy

conda/nd.recipe/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ elif [ `uname` == Darwin ]; then
1111
fi
1212

1313
cd ../../
14-
$PYTHON setup.py build_ext --target=nd --extra-cmake-args=$EXTRA_CMAKE_ARGS install || exit 1
14+
$PYTHON setup.py build_ext --target=nd --extra-cmake-args=$EXTRA_CMAKE_ARGS install --single-version-externally-managed --record=record.txt || exit 1

conda/ndt.recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cd %RECIPE_DIR%
22
cd ..\..\
33

4-
python setup.py install --target=ndt || exit 1
4+
python setup.py install --target=ndt --single-version-externally-managed --record=record.txt || exit 1
55

66
rd /s /q %SP_DIR%\__pycache__
77
rd /s /q %SP_DIR%\numpy

conda/ndt.recipe/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ elif [ `uname` == Darwin ]; then
1111
fi
1212

1313
cd ../../
14-
$PYTHON setup.py build_ext --target=ndt --extra-cmake-args=$EXTRA_CMAKE_ARGS install || exit 1
14+
$PYTHON setup.py build_ext --target=ndt --extra-cmake-args=$EXTRA_CMAKE_ARGS install --single-version-externally-managed --record=record.txt || exit 1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def get_library_names(self, build_type):
107107

108108
def get_requirements(self):
109109
reqs = open('dev-requirements.txt').read().strip().split('\n')
110-
if self.target != 'ndt':
110+
if self.target == 'nd':
111111
reqs.append('dynd.ndt')
112112
return reqs
113113

0 commit comments

Comments
 (0)