diff --git a/ci/requirements_appveyor.txt b/ci/requirements_appveyor.txt index 4ed039c31..82bb6d836 100644 --- a/ci/requirements_appveyor.txt +++ b/ci/requirements_appveyor.txt @@ -4,6 +4,6 @@ wheel numpy Cython -lxml +lxml>=4.6.3 Pillow h5py \ No newline at end of file diff --git a/ci/requirements_gh.txt b/ci/requirements_gh.txt index ae6699325..7ff48b102 100644 --- a/ci/requirements_gh.txt +++ b/ci/requirements_gh.txt @@ -11,4 +11,4 @@ numpy; python_version>= '3.6' h5py cython Pillow -lxml +lxml>=4.6.3 diff --git a/ci/requirements_rtd.txt b/ci/requirements_rtd.txt index 68ff8b0f2..c2a696bcc 100644 --- a/ci/requirements_rtd.txt +++ b/ci/requirements_rtd.txt @@ -5,5 +5,5 @@ sphinx cython sphinxcontrib-programoutput nbsphinx -lxml +lxml>=4.6.3 pillow diff --git a/ci/requirements_travis.txt b/ci/requirements_travis.txt index 12f04af31..1804f98f4 100644 --- a/ci/requirements_travis.txt +++ b/ci/requirements_travis.txt @@ -4,9 +4,6 @@ wheel h5py -numpy<1.16.0; python_version == '3.4' -numpy>=1.16.0; python_version=='2.7' or python_version>='3.5' cython Pillow -lxml<4.4.0; python_version == '3.4' -lxml>=4.4.0; python_version=='2.7' or python_version>='3.5' +lxml>=4.6.3 diff --git a/fabio/ext/dense.pyx b/fabio/ext/dense.pyx index f1df6cbfc..ce6b5733b 100644 --- a/fabio/ext/dense.pyx +++ b/fabio/ext/dense.pyx @@ -31,7 +31,7 @@ """Densification of sparse frame format """ __author__ = "Jérôme Kieffer" -__date__ = "18/12/2020" +__date__ = "03/05/2021" __contact__ = "Jerome.kieffer@esrf.fr" __license__ = "MIT" @@ -126,7 +126,7 @@ def densify(float[:,::1] mask, try: value = time.time_ns() except Exception: - value = int(time.time()/EPS64) + value = int(time.time()*1e9) srand( (value%RAND_MAX)) with nogil: diff --git a/requirements.txt b/requirements.txt index 01eacd42c..661cc2bcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ #List of dependecies used by PIP but also by ReadTheDocs to generate the documentation on the fly numpy cython -lxml +lxml>=4.6.3 h5py hdf5plugin sphinx