Merge ~cjwatson/launchpad:remove-futures into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: b371ca4ffe16bb966b3e3f1b935f535969eadad3
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:remove-futures
Merge into: launchpad:master
Diff against target: 29 lines (+0/-7)
2 files modified
requirements/launchpad.txt (+0/-1)
setup.cfg (+0/-6)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+442864@code.launchpad.net

Commit message

Remove futures requirement

Description of the change

This is no longer needed on Python 3.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
2index e15a388..a76d45e 100644
3--- a/requirements/launchpad.txt
4+++ b/requirements/launchpad.txt
5@@ -55,7 +55,6 @@ fastimport==0.9.8
6 feedparser==5.2.1
7 flit-core==3.3.0
8 FormEncode==1.3.1
9-futures==3.3.0
10 geoip2==2.9.0
11 grokcore.component==3.1
12 gunicorn==20.1.0
13diff --git a/setup.cfg b/setup.cfg
14index be574c6..72ea910 100644
15--- a/setup.cfg
16+++ b/setup.cfg
17@@ -33,12 +33,6 @@ install_requires =
18 dohq-artifactory
19 feedparser
20 fixtures
21- # Required for gunicorn[gthread]. We depend on it explicitly because
22- # gunicorn declares its dependency in a way that produces (and thus may
23- # cache) different wheels depending on whether it was built on Python 2
24- # or 3 while claiming that the wheels are universal.
25- # XXX cjwatson 2020-02-03: Remove this once we're on Python 3.
26- futures; python_version < "3.2"
27 geoip2
28 gunicorn
29 importlib-resources; python_version < "3.7"

Subscribers

People subscribed via source and target branches

to status/vote changes: