Merge pull request #1398 from gnocchixyz/mergify/bp/stable/4.6/pr-1366

Remove the use of the future module (backport #1366)
gnocchixyz · Aug 20, 2024 · 399448e · 399448e
2 parents 146d3cd + 193b44a
commit 399448e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 11 deletions.
diff --git a/gnocchi/common/redis.py b/gnocchi/common/redis.py
@@ -14,8 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
-
 from oslo_config import cfg
 from urllib import parse
 

diff --git a/gnocchi/gendoc.py b/gnocchi/gendoc.py
@@ -13,7 +13,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from __future__ import absolute_import
+
 import io
 import json
 import os

diff --git a/gnocchi/indexer/sqlalchemy.py b/gnocchi/indexer/sqlalchemy.py
@@ -13,7 +13,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from __future__ import absolute_import
+
 import datetime
 import itertools
 import operator

diff --git a/gnocchi/indexer/sqlalchemy_base.py b/gnocchi/indexer/sqlalchemy_base.py
@@ -14,7 +14,6 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from __future__ import absolute_import
 
 from oslo_db.sqlalchemy import models
 import sqlalchemy

diff --git a/gnocchi/indexer/sqlalchemy_extension.py b/gnocchi/indexer/sqlalchemy_extension.py
@@ -12,8 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
-
 import sqlalchemy
 import sqlalchemy_utils
 

diff --git a/gnocchi/indexer/sqlalchemy_types.py b/gnocchi/indexer/sqlalchemy_types.py
@@ -14,7 +14,6 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from __future__ import absolute_import
 
 import calendar
 import datetime

diff --git a/gnocchi/tests/functional/fixtures.py b/gnocchi/tests/functional/fixtures.py
@@ -14,8 +14,6 @@
 # under the License.
 """Fixtures for use with gabbi tests."""
 
-from __future__ import absolute_import
-
 import logging
 import os
 import shutil

diff --git a/setup.cfg b/setup.cfg
@@ -36,7 +36,6 @@ install_requires =
     oslo.middleware>=3.22.0
     pytimeparse
     pecan>=0.9
-    futures; python_version < '3'
     jsonpatch
     cotyledon>=1.5.0
     stevedore