Merge pull request #51306 from cjmayo/future

Remove Python future package from installation
qgis · Jan 1, 2023 · b66cb0c · b66cb0c
2 parents 2aacff1 + 04b1ee9
commit b66cb0c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 20 deletions.
diff --git a/INSTALL.md b/INSTALL.md
diff --git a/debian/control b/debian/control
@@ -44,7 +44,6 @@ Build-Depends:
  pyqt5.qsci-dev,
  python3-all-dev,
  python3-dev,
- python3-future,
  python3-gdal,
  python3-mock,
  python3-nose2,
@@ -364,7 +363,6 @@ Depends:
  libqgispython2.99.0,
  libsqlite3-mod-spatialite,
  python3-dateutil,
- python3-future,
  python3-httplib2,
  python3-jinja2,
  python3-markupsafe,

diff --git a/debian/control.in b/debian/control.in
@@ -46,7 +46,6 @@ Build-Depends:
  pyqt5.qsci-dev,
  python3-all-dev,
  python3-dev,
- python3-future,
  python3-gdal,
  python3-mock,
  python3-nose2,
@@ -377,7 +376,6 @@ Depends:
  libqgispython{QGIS_ABI},
  libsqlite3-mod-spatialite,
  python3-dateutil,
- python3-future,
  python3-httplib2,
  python3-jinja2,
  python3-markupsafe,

diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,3 @@ nose2
 psycopg2
 numpy
 pyyaml
-future
diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template
@@ -91,7 +91,6 @@ BuildRequires:  ocl-icd-devel
 
 # Python stuff
 BuildRequires:  python3-devel
-BuildRequires:  python3-future
 BuildRequires:  python3-jinja2
 BuildRequires:  python3-OWSLib
 BuildRequires:  python3-psycopg2
@@ -182,7 +181,6 @@ Requires:       python3-gdal
 Requires:       gdal-python3
 %endif
 Requires:       gdal-python-tools
-Requires:       python3-future
 Requires:       python3-jinja2
 Requires:       python3-OWSLib
 Requires:       python3-psycopg2

diff --git a/scripts/parse_dash_results.py b/scripts/parse_dash_results.py
@@ -17,10 +17,6 @@
 *                                                                         *
 ***************************************************************************
 """
-from __future__ import print_function
-from future import standard_library
-standard_library.install_aliases()
-from builtins import range
 
 __author__ = 'Nyall Dawson'
 __date__ = 'October 2016'