Skip to content

Commit

Permalink
Merge pull request #257 from WildMeOrg/build-exclude-flukematch-fix
Browse files Browse the repository at this point in the history
Exclude the flukematch and upgrade the Cython package which is the TF dependency
  • Loading branch information
holmbergius authored Aug 16, 2023
2 parents 74a5f94 + 098bf06 commit 40e0d05
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion devops/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ RUN set -ex \

# Run smoke tests
# && /virtualenv/env3/bin/python -c "import wbia; from wbia.__main__ import smoke_test; smoke_test()" \
# && /virtualenv/env3/bin/python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" \ -- commented out due to Lasagne package dependency issues
RUN set -ex \
&& mkdir -p /data \
&& /virtualenv/env3/bin/python -m wbia.dev --set-workdir /data --preload-exit \
Expand All @@ -144,7 +145,6 @@ RUN set -ex \
&& /virtualenv/env3/bin/python -c "import wbia_pie_v2; from wbia_pie_v2.__main__ import main; main()" \
&& /virtualenv/env3/bin/python -c "import wbia_blend; from wbia_blend._plugin import *" \
&& /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \
&& /virtualenv/env3/bin/python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" \
&& /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \
&& /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \
&& /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \
Expand Down
3 changes: 3 additions & 0 deletions devops/_config/deprecated.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ cd /wbia \

git clone https://github.com/WildMeOrg/wbia-plugin-pie.git

/virtualenv/env3/bin/pip install --upgrade Cython
/virtualenv/env3/bin/pip install --upgrade gast

/bin/bash -xc '. /virtualenv/env3/bin/activate \
&& cd /wbia/wbia-plugin-pie \
&& /bin/bash run_developer_setup.sh'
Expand Down
2 changes: 1 addition & 1 deletion devops/install.ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pip install --no-cache-dir --upgrade \
scikit-build \
'setuptools>=42' \
'setuptools_scm[toml]>=3.4' \
cython \
cython==3.0.0 \
numpy \
ipython

Expand Down
2 changes: 1 addition & 1 deletion requirements/runtime.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ boto==2.49.0
cachetools==5.2.0
click==7.1.2
colorama==0.4.5
Cython==0.29.32
Cython==3.0.0
dateutils==0.6.12
delorean==1.0.0
deprecated==1.2.13
Expand Down

0 comments on commit 40e0d05

Please sign in to comment.