Skip to content

Commit

Permalink
build: fix packages versions and scikit-version
Browse files Browse the repository at this point in the history
Packages requiere newer Python versions than 3.8.
But some packages are old and use deprecated features (scikit-video),
so I added a quick fix. Ideally I fix it at some point.
Some versions on requirements are also more clearly specified, as there
are other deprecations.
  • Loading branch information
alonfnt committed Mar 14, 2024
1 parent 75bddf5 commit 81098ac
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: '3.10'
architecture: 'x64'

- name: apt-get
Expand Down
6 changes: 6 additions & 0 deletions examples/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
import deeptangle as dt
import matplotlib.pyplot as plt
from skimage.exposure import equalize_adapthist
import numpy

# scikit-video uses deprecated numpy.float, numpy.int
# hacky fix: https://github.com/scikit-video/scikit-video/issues/154
numpy.float = numpy.float64
numpy.int = numpy.int_
import skvideo.io


Expand Down
6 changes: 6 additions & 0 deletions examples/track.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
import matplotlib.pyplot as plt
import numpy as np
from skimage.exposure import equalize_adapthist

# scikit-video uses deprecated numpy.float, numpy.int
# hacky fix: https://github.com/scikit-video/scikit-video/issues/154
import numpy
numpy.float = numpy.float64
numpy.int = numpy.int_
import skvideo.io

import deeptangle as dt
Expand Down
9 changes: 5 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ scikit-image
scikit-video
optax
chex
jax
jax>=0.4.16
jaxlib>=0.4.20
dm-pix
scikit-learn
numpy==1.21.6
numba==0.55
numpy>=1.21.6
numba>=0.55
matplotlib
https://github.com/alonfnt/dm-haiku/archive/refs/heads/avg_pool_perf.zip
dm-haiku
trackpy

0 comments on commit 81098ac

Please sign in to comment.