Skip to content

Commit 8bb7a91

Browse files
committed
fix packaging and deployment
1 parent a33aa94 commit 8bb7a91

5 files changed

Lines changed: 12 additions & 7 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2125,8 +2125,9 @@ asset:
21252125
To upload a tarball to Github, compress the conda environment and drag and drop
21262126
it into the assets section of the releases page:
21272127

2128+
$ conda activate base
21282129
$ conda install -c conda-forge conda-pack
2129-
$ conda pack -n songexplorer -o songexplorer-<version>-<architecture>.tar.gz
2130+
$ conda-pack -n songexplorer -o songexplorer-<version>-<architecture>.tar.gz
21302131

21312132
After downloading, some users will need to re-install some pip dependencies
21322133
(e.g. tensorflow-metal on MacOS) as they are not in general relocatable:

app/DROP-FILES-HERE.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
SCRIPT_DIR=$( cd -- "$( dirname -- "${(%):-%N}" )" &> /dev/null && pwd )
44

5-
export PATH=$SCRIPT_DIR/songexplorer/bin:$PATH
5+
source $SCRIPT_DIR/songexplorer/bin/activate
66

77
$SCRIPT_DIR/make-predictions.py $argv
8+
9+
sleep 10

app/OPEN-WITH-TERMINAL.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
SCRIPT_DIR=$( cd -- "$( dirname -- "${(%):-%N}" )" &> /dev/null && pwd )
44

5-
export PATH=$SCRIPT_DIR/songexplorer/bin:$PATH
5+
source $SCRIPT_DIR/songexplorer/bin/activate
66

77
$SCRIPT_DIR/songexplorer/bin/songexplorer/src/songexplorer $SCRIPT_DIR/configuration.py 8080
8+
9+
sleep 10

install/conda/songexplorer/post-link.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo optionally, to use video in songexplorer cut and paste the following into t
66
echo conda activate songexplorer >> %PREFIX%\.messages.txt
77
echo conda install av=8.1 git >> %PREFIX%\.messages.txt
88
echo cd $env:CONDA_PREFIX\Lib\site-packages >> %PREFIX%\.messages.txt
9-
echo pip3 install -e git+https://github.com/soft-matter/pims.git@7bd634015ecbfeb7d92f9f9d69f8b5bb4686a6b4#egg=pims >> %PREFIX%\.messages.txt
9+
echo pip3 install git+https://github.com/soft-matter/pims.git@7bd634015ecbfeb7d92f9f9d69f8b5bb4686a6b4#egg=pims >> %PREFIX%\.messages.txt
1010
echo either way, to finish the installation cut and paste the following: >> %PREFIX%\.messages.txt
1111
echo conda activate songexplorer >> %PREFIX%\.messages.txt
1212
echo pip3 install tensorflow^=^=2.10 tensorflow-io^=^=0.27.0 >> %PREFIX%\.messages.txt

install/conda/songexplorer/post-link.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ optionally, to use video in songexplorer cut and paste the following into the co
44
conda activate songexplorer
55
conda install av=8.1 git
66
cd \$CONDA_PREFIX/lib/python3.10/site-packages
7-
pip3 install -e git+https://github.com/soft-matter/pims.git@7bd634015ecbfeb7d92f9f9d69f8b5bb4686a6b4#egg=pims
7+
pip3 install git+https://github.com/soft-matter/pims.git@7bd634015ecbfeb7d92f9f9d69f8b5bb4686a6b4#egg=pims
88
either way, to finish the installation cut and paste the following:
99
EOF
1010

1111
if [ `uname` == Darwin ] ; then
1212
cat << EOF >> ${PREFIX}/.messages.txt
1313
conda activate songexplorer
14-
pip3 install tensorflow[tensorflow-io]
14+
pip3 install tensorflow==2.16.2
1515
EOF
1616
if [ `uname -m` == arm64 ] ; then
1717
cat << EOF >> ${PREFIX}/.messages.txt
1818
pip3 install tensorflow-metal
19-
pip3 install tensorflow-io==<VERSION> # https://github.com/tensorflow/io?tab=readme-ov-file#tensorflow-version-compatibility
19+
pip3 install tensorflow-io==0.37.1
2020
EOF
2121
fi
2222
else

0 commit comments

Comments
 (0)