diff --git a/gnocchi/carbonara.py b/gnocchi/carbonara.py index d84f974a5..22ec38e00 100644 --- a/gnocchi/carbonara.py +++ b/gnocchi/carbonara.py @@ -196,8 +196,8 @@ def quantile(self, q): ordered = numpy.lexsort((self._ts['values'], self.indexes)) min_pos = numpy.cumsum(self.counts) - self.counts real_pos = min_pos + (self.counts - 1) * (q / 100) - floor_pos = numpy.floor(real_pos).astype(numpy.int, copy=False) - ceil_pos = numpy.ceil(real_pos).astype(numpy.int, copy=False) + floor_pos = numpy.floor(real_pos).astype(numpy.integer, copy=False) + ceil_pos = numpy.ceil(real_pos).astype(numpy.integer, copy=False) values = ( self._ts['values'][ordered][floor_pos] * (ceil_pos - real_pos) + self._ts['values'][ordered][ceil_pos] * (real_pos - floor_pos)) @@ -772,7 +772,7 @@ def serialize(self, start, compressed=True): first = self.first # NOTE(jd) needed because faster e_offset = int((self.last - first) / offset_div) + 1 - locs = numpy.zeros(self.timestamps.size, dtype=numpy.int) + locs = numpy.zeros(self.timestamps.size, dtype=numpy.integer) locs[1:] = numpy.cumsum(numpy.diff(self.timestamps)) / offset_div # Fill everything with zero and set diff --git a/setup.cfg b/setup.cfg index 5ec536a4a..504382001 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ packages = include_package_data = true install_requires = - numpy>=1.9.0,<1.24 + numpy>=1.9.0 iso8601 oslo.config>=3.22.0 oslo.policy>=1.7.0 diff --git a/tox.ini b/tox.ini index 339e77281..c2c1839f6 100644 --- a/tox.ini +++ b/tox.ini @@ -46,8 +46,8 @@ deps = .[test,redis,prometheus,amqp1,{env:GNOCCHI_STORAGE_DEPS:},{env:GNOCCHI_INDEXER_DEPS:}] {env:GNOCCHI_TEST_TARBALLS:} # TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is - # merged and released https://github.com/jd/pifpaf/pull/152 - git+https://github.com/tobias-urdin/pifpaf@d29957e0a2f0ff80d4c9eac1605002176bd9b67e + # merged and released + git+https://github.com/jd/pifpaf@d5103d4bcf80aa6f74e31e92e4a7eb92997d4c73 cliff!=2.9.0 gnocchiclient>=2.8.0,!=7.0.7 commands = @@ -63,8 +63,8 @@ setenv = GNOCCHI_VARIANT=test,postgresql,file deps = # TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is - # merged and released https://github.com/jd/pifpaf/pull/152 - git+https://github.com/tobias-urdin/pifpaf@d29957e0a2f0ff80d4c9eac1605002176bd9b67e + # merged and released + git+https://github.com/jd/pifpaf@d5103d4bcf80aa6f74e31e92e4a7eb92997d4c73 gnocchiclient>=2.8.0,!=7.0.7 xattr!=0.9.4 commands = {toxinidir}/run-upgrade-tests.sh postgresql-file @@ -78,8 +78,8 @@ setenv = GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib deps = # TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is - # merged and released https://github.com/jd/pifpaf/pull/152 - git+https://github.com/tobias-urdin/pifpaf@d29957e0a2f0ff80d4c9eac1605002176bd9b67e + # merged and released + git+https://github.com/jd/pifpaf@d5103d4bcf80aa6f74e31e92e4a7eb92997d4c73 gnocchiclient>=2.8.0,!=7.0.7 xattr!=0.9.4 commands = {toxinidir}/run-upgrade-tests.sh mysql-ceph