diff --git a/conda_upload.sh b/conda_upload.sh index b5fb50343..7b4b757ff 100644 --- a/conda_upload.sh +++ b/conda_upload.sh @@ -12,33 +12,30 @@ echo "Building conda package..." conda build . -c novelakrk -c conda-forge --no-include-recipe || exit 1 echo "Move conda package..." -mv ${CONDA_BUILD_PATH}/linux-64/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 ${CONDA_BUILD_PATH} || exit 1 +mv ${CONDA_BUILD_PATH}/linux-64/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 ${CONDA_BUILD_PATH} || exit 1 echo "Making new_tar dir..." mkdir ${CONDA_BUILD_PATH}/new_tar || exit 1 echo "Extracting conda package..." -tar -xf ${CONDA_BUILD_PATH}/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 -C ${CONDA_BUILD_PATH}/new_tar || exit 1 +tar -xf ${CONDA_BUILD_PATH}/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 -C ${CONDA_BUILD_PATH}/new_tar || exit 1 cd ${CONDA_BUILD_PATH}/new_tar || exit 1 echo "Creating new conda package without some files..." -tar -cjvf ${PKG_NAME}-${VERSION}-py37_0.tar.bz2 --exclude=info/recipe/rec_to_nwb/test --exclude=info/recipe/rec_to_nwb/scripts --exclude='*.sh' --exclude='*.gitignore' --exclude='*.pytest_cache' --exclude='*.gitignore' info lib || exit 1 +tar -cjvf ${PKG_NAME}-${VERSION}-py36_0.tar.bz2 --exclude=info/recipe/rec_to_nwb/test --exclude=info/recipe/rec_to_nwb/scripts --exclude='*.sh' --exclude='*.gitignore' --exclude='*.pytest_cache' --exclude='*.gitignore' info lib || exit 1 cd .. echo "Move conda package to linux dir..." -mv new_tar/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 linux-64 || exit 1 +mv new_tar/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 linux-64 || exit 1 echo "Converting conda package..." -conda convert --platform osx-64 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 -conda convert --platform linux-32 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 -conda convert --platform linux-64 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 -conda convert --platform win-32 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 -conda convert --platform win-64 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py37_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 +conda convert --platform osx-64 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 +conda convert --platform linux-32 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 +conda convert --platform linux-64 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 +conda convert --platform win-32 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 +conda convert --platform win-64 $CONDA_BUILD_PATH/linux-64/${PKG_NAME}-${VERSION}-py36_0.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 echo "Deploying to Anaconda.org..." anaconda upload $CONDA_BUILD_PATH/**/$PKG_NAME-*.tar.bz2 --force || exit 1 - - - diff --git a/meta.yaml b/meta.yaml index 413ad0f1a..89c3dd236 100644 --- a/meta.yaml +++ b/meta.yaml @@ -12,69 +12,70 @@ build: number: 0 requirements: - build: - - python>=3.6 - - pip - - setuptools - - hdmf - - libblas - - pynwb - - testfixtures - - vdom - - xmlschema - - hdf5 - - liblapack - - elementpath - - rec_to_binaries==0.6.0.dev0 - - libcblas - run: - - python>=3.6 - - asn1crypto - - blas - - bleach - - ca-certificates - - certifi - - cffi - - chardet - - cryptography - - elementpath - - h5py - - hdf5 - - hdmf - - idna - - libblas - - libcblas - - liblapack - - mkl - - mkl-service - - mountainlab_pytools - - numpy - - openssl - - pandas - - pip - - pycparser - - pynwb - - pyopenssl - - pysocks - - pytest - - python-dateutil - - pytz - - pyyaml - - requests - - scipy - - setuptools - - six - - sqlite - - testfixtures - - urllib3 - - vdom - - jp_proxy_widget - - wheel - - xmlschema - - zlib - - rec_to_binaries==0.6.0.dev0 - - xmldiff - - ndx-franklab-novela=0.0.011 + build: + - python=3.6 + - setuptools + - pip + - hdmf + - pynwb + - libblas + - testfixtures + - vdom + - xmlschema + - hdf5 + - liblapack + - elementpath + - rec_to_binaries==0.6.0.dev0 + - libcblas + run: + - python>=3.6 + - setuptools + - hdmf + - pynwb + - asn1crypto + - blas + - bleach + - ca-certificates + - certifi + - cffi + - chardet + - cryptography + - elementpath + - h5py + - hdf5 + - idna + - libblas + - libcblas + - liblapack + - mkl + - mkl-service + - mountainlab_pytools + - numpy + - openssl + - pandas + - pip + - pycparser + - pyopenssl + - pysocks + - pytest + - python-dateutil + - pytz + - pyyaml + - requests + - scipy + - six + - sqlite + - testfixtures + - urllib3 + - vdom + - jp_proxy_widget + - wheel + - xmlschema + - zlib + - rec_to_binaries==0.6.0.dev0 + - xmldiff + - ndx-franklab-novela=0.0.011 + about: diff --git a/rec_to_nwb/environment.yml b/rec_to_nwb/environment.yml index 597bd4748..121f385bb 100644 --- a/rec_to_nwb/environment.yml +++ b/rec_to_nwb/environment.yml @@ -4,8 +4,10 @@ channels: - defaults - novelakrk dependencies: - - python>=3.6 + - python>=3.6,<3.8 - pip + - hdmf + - pynwb - asn1crypto - blas - ca-certificates @@ -16,7 +18,6 @@ dependencies: - elementpath - h5py - hdf5 - - hdmf - idna - libblas - libcblas @@ -27,7 +28,6 @@ dependencies: - openssl - pandas - pycparser - - pynwb - pyopenssl - pysocks - python-dateutil @@ -45,7 +45,7 @@ dependencies: - pyyaml - pytest - testfixtures - - ndx-franklab-novela=0.0.011.36 + - ndx-franklab-novela=0.0.011 - pip: - mountainlab_pytools - xmldiff