From d18745a9c04e9fa562afc9da7ac55ba9638a1e31 Mon Sep 17 00:00:00 2001
From: sydneyli <sydney@eff.org>
Date: Fri, 18 Jan 2019 11:40:53 -0800
Subject: [PATCH] Revert "Add static dependencies for each plugin."

This reverts commit eca5268a8a7a512844ce35b029f94231e9f159ca.
---
 certbot-dns-cloudflare/Dockerfile                | 3 +--
 certbot-dns-cloudflare/plugin_dependencies.txt   | 4 ----
 certbot-dns-cloudxns/Dockerfile                  | 3 +--
 certbot-dns-cloudxns/plugin_dependencies.txt     | 4 ----
 certbot-dns-digitalocean/Dockerfile              | 3 +--
 certbot-dns-digitalocean/plugin_dependencies.txt | 1 -
 certbot-dns-dnsimple/Dockerfile                  | 3 +--
 certbot-dns-dnsimple/plugin_dependencies.txt     | 4 ----
 certbot-dns-dnsmadeeasy/Dockerfile               | 3 +--
 certbot-dns-dnsmadeeasy/plugin_dependencies.txt  | 4 ----
 certbot-dns-gehirn/Dockerfile                    | 3 +--
 certbot-dns-gehirn/plugin_dependencies.txt       | 4 ----
 certbot-dns-google/Dockerfile                    | 3 +--
 certbot-dns-google/plugin_dependencies.txt       | 8 --------
 certbot-dns-linode/Dockerfile                    | 3 +--
 certbot-dns-linode/plugin_dependencies.txt       | 4 ----
 certbot-dns-luadns/Dockerfile                    | 3 +--
 certbot-dns-luadns/plugin_dependencies.txt       | 4 ----
 certbot-dns-nsone/Dockerfile                     | 3 +--
 certbot-dns-nsone/plugin_dependencies.txt        | 4 ----
 certbot-dns-ovh/Dockerfile                       | 3 +--
 certbot-dns-ovh/plugin_dependencies.txt          | 4 ----
 certbot-dns-rfc2136/Dockerfile                   | 3 +--
 certbot-dns-rfc2136/plugin_dependencies.txt      | 1 -
 certbot-dns-route53/Dockerfile                   | 3 +--
 certbot-dns-route53/plugin_dependencies.txt      | 7 -------
 certbot-dns-sakuracloud/Dockerfile               | 3 +--
 certbot-dns-sakuracloud/plugin_dependencies.txt  | 4 ----
 28 files changed, 14 insertions(+), 85 deletions(-)
 delete mode 100644 certbot-dns-cloudflare/plugin_dependencies.txt
 delete mode 100644 certbot-dns-cloudxns/plugin_dependencies.txt
 delete mode 100644 certbot-dns-digitalocean/plugin_dependencies.txt
 delete mode 100644 certbot-dns-dnsimple/plugin_dependencies.txt
 delete mode 100644 certbot-dns-dnsmadeeasy/plugin_dependencies.txt
 delete mode 100644 certbot-dns-gehirn/plugin_dependencies.txt
 delete mode 100644 certbot-dns-google/plugin_dependencies.txt
 delete mode 100644 certbot-dns-linode/plugin_dependencies.txt
 delete mode 100644 certbot-dns-luadns/plugin_dependencies.txt
 delete mode 100644 certbot-dns-nsone/plugin_dependencies.txt
 delete mode 100644 certbot-dns-ovh/plugin_dependencies.txt
 delete mode 100644 certbot-dns-rfc2136/plugin_dependencies.txt
 delete mode 100644 certbot-dns-route53/plugin_dependencies.txt
 delete mode 100644 certbot-dns-sakuracloud/plugin_dependencies.txt

diff --git a/certbot-dns-cloudflare/Dockerfile b/certbot-dns-cloudflare/Dockerfile
index b017913de..27dcc8751 100644
--- a/certbot-dns-cloudflare/Dockerfile
+++ b/certbot-dns-cloudflare/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-cloudflare
 
-RUN pip install -r src/certbot-dns-cloudflare/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-cloudflare
+RUN pip install --no-cache-dir --editable src/certbot-dns-cloudflare
diff --git a/certbot-dns-cloudflare/plugin_dependencies.txt b/certbot-dns-cloudflare/plugin_dependencies.txt
deleted file mode 100644
index 01de24017..000000000
--- a/certbot-dns-cloudflare/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cloudflare==1.5.1
-future==0.16.0
-logger==1.4
-PyYAML==3.13
diff --git a/certbot-dns-cloudxns/Dockerfile b/certbot-dns-cloudxns/Dockerfile
index c917517a8..cc84ea65b 100644
--- a/certbot-dns-cloudxns/Dockerfile
+++ b/certbot-dns-cloudxns/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-cloudxns
 
-RUN pip install -r src/certbot-dns-cloudxns/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-cloudxns
+RUN pip install --no-cache-dir --editable src/certbot-dns-cloudxns
diff --git a/certbot-dns-cloudxns/plugin_dependencies.txt b/certbot-dns-cloudxns/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-cloudxns/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-digitalocean/Dockerfile b/certbot-dns-digitalocean/Dockerfile
index 0b26958cc..8bdd0619f 100644
--- a/certbot-dns-digitalocean/Dockerfile
+++ b/certbot-dns-digitalocean/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-digitalocean
 
-RUN pip install -r src/certbot-dns-digitalocean/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-digitalocean
+RUN pip install --no-cache-dir --editable src/certbot-dns-digitalocean
diff --git a/certbot-dns-digitalocean/plugin_dependencies.txt b/certbot-dns-digitalocean/plugin_dependencies.txt
deleted file mode 100644
index ce8a18f1e..000000000
--- a/certbot-dns-digitalocean/plugin_dependencies.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-digitalocean==1.11
diff --git a/certbot-dns-dnsimple/Dockerfile b/certbot-dns-dnsimple/Dockerfile
index ec08f68c3..38d2be80e 100644
--- a/certbot-dns-dnsimple/Dockerfile
+++ b/certbot-dns-dnsimple/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-dnsimple
 
-RUN pip install -r src/certbot-dns-dnsimple/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-dnsimple
+RUN pip install --no-cache-dir --editable src/certbot-dns-dnsimple
diff --git a/certbot-dns-dnsimple/plugin_dependencies.txt b/certbot-dns-dnsimple/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-dnsimple/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-dnsmadeeasy/Dockerfile b/certbot-dns-dnsmadeeasy/Dockerfile
index 49b7de595..ff7936925 100644
--- a/certbot-dns-dnsmadeeasy/Dockerfile
+++ b/certbot-dns-dnsmadeeasy/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-dnsmadeeasy
 
-RUN pip install -r src/certbot-dns-dnsmadeeasy/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-dnsmadeeasy
+RUN pip install --no-cache-dir --editable src/certbot-dns-dnsmadeeasy
diff --git a/certbot-dns-dnsmadeeasy/plugin_dependencies.txt b/certbot-dns-dnsmadeeasy/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-dnsmadeeasy/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-gehirn/Dockerfile b/certbot-dns-gehirn/Dockerfile
index 8733f2b24..48ad902b5 100644
--- a/certbot-dns-gehirn/Dockerfile
+++ b/certbot-dns-gehirn/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-gehirn
 
-RUN pip install -r src/certbot-dns-gehirn/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-gehirn
+RUN pip install --no-cache-dir --editable src/certbot-dns-gehirn
diff --git a/certbot-dns-gehirn/plugin_dependencies.txt b/certbot-dns-gehirn/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-gehirn/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-google/Dockerfile b/certbot-dns-google/Dockerfile
index a0e711fb6..4a258d0ee 100644
--- a/certbot-dns-google/Dockerfile
+++ b/certbot-dns-google/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-google
 
-RUN pip install -r src/certbot-dns-google/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-google
+RUN pip install --no-cache-dir --editable src/certbot-dns-google
diff --git a/certbot-dns-google/plugin_dependencies.txt b/certbot-dns-google/plugin_dependencies.txt
deleted file mode 100644
index 25734b963..000000000
--- a/certbot-dns-google/plugin_dependencies.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-google-api-python-client==1.5.0
-httplib2==0.10.3
-oauth2client==2.0.0
-pyasn1==0.1.9
-pyasn1-modules==0.0.10
-rsa==3.4.2
-simplejson==3.16.0
-uritemplate==0.6
diff --git a/certbot-dns-linode/Dockerfile b/certbot-dns-linode/Dockerfile
index de5d6c95a..2e237b521 100644
--- a/certbot-dns-linode/Dockerfile
+++ b/certbot-dns-linode/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-linode
 
-RUN pip install -r src/certbot-dns-linode/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-linode
+RUN pip install --no-cache-dir --editable src/certbot-dns-linode
diff --git a/certbot-dns-linode/plugin_dependencies.txt b/certbot-dns-linode/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-linode/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-luadns/Dockerfile b/certbot-dns-luadns/Dockerfile
index a68669592..6efb4d777 100644
--- a/certbot-dns-luadns/Dockerfile
+++ b/certbot-dns-luadns/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-luadns
 
-RUN pip install -r src/certbot-dns-luadns/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-luadns
+RUN pip install --no-cache-dir --editable src/certbot-dns-luadns
diff --git a/certbot-dns-luadns/plugin_dependencies.txt b/certbot-dns-luadns/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-luadns/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-nsone/Dockerfile b/certbot-dns-nsone/Dockerfile
index 7c3f1bec5..88fc13c57 100644
--- a/certbot-dns-nsone/Dockerfile
+++ b/certbot-dns-nsone/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-nsone
 
-RUN pip install -r src/certbot-dns-nsone/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-nsone
+RUN pip install --no-cache-dir --editable src/certbot-dns-nsone
diff --git a/certbot-dns-nsone/plugin_dependencies.txt b/certbot-dns-nsone/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-nsone/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-ovh/Dockerfile b/certbot-dns-ovh/Dockerfile
index 45cc22c26..e8da96d95 100644
--- a/certbot-dns-ovh/Dockerfile
+++ b/certbot-dns-ovh/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-ovh
 
-RUN pip install -r src/certbot-dns-ovh/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-ovh
+RUN pip install --no-cache-dir --editable src/certbot-dns-ovh
diff --git a/certbot-dns-ovh/plugin_dependencies.txt b/certbot-dns-ovh/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-ovh/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0
diff --git a/certbot-dns-rfc2136/Dockerfile b/certbot-dns-rfc2136/Dockerfile
index f8a32f21c..1b8feb2f8 100644
--- a/certbot-dns-rfc2136/Dockerfile
+++ b/certbot-dns-rfc2136/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-rfc2136
 
-RUN pip install -r src/certbot-dns-rfc2136/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-rfc2136
+RUN pip install --no-cache-dir --editable src/certbot-dns-rfc2136
diff --git a/certbot-dns-rfc2136/plugin_dependencies.txt b/certbot-dns-rfc2136/plugin_dependencies.txt
deleted file mode 100644
index a5d652679..000000000
--- a/certbot-dns-rfc2136/plugin_dependencies.txt
+++ /dev/null
@@ -1 +0,0 @@
-dnspython==1.15.0
diff --git a/certbot-dns-route53/Dockerfile b/certbot-dns-route53/Dockerfile
index 3ecaed2c8..a1b8d6caf 100644
--- a/certbot-dns-route53/Dockerfile
+++ b/certbot-dns-route53/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-route53
 
-RUN pip install -r src/certbot-dns-route53/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-route53
+RUN pip install --no-cache-dir --editable src/certbot-dns-route53
diff --git a/certbot-dns-route53/plugin_dependencies.txt b/certbot-dns-route53/plugin_dependencies.txt
deleted file mode 100644
index 8d239c955..000000000
--- a/certbot-dns-route53/plugin_dependencies.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-boto3==1.9.36
-botocore==1.12.36
-docutils==0.12
-futures==3.1.1
-jmespath==0.9.3
-python-dateutil==2.6.1
-s3transfer==0.1.11
diff --git a/certbot-dns-sakuracloud/Dockerfile b/certbot-dns-sakuracloud/Dockerfile
index 66ebd6fbc..694773f61 100644
--- a/certbot-dns-sakuracloud/Dockerfile
+++ b/certbot-dns-sakuracloud/Dockerfile
@@ -2,5 +2,4 @@ FROM certbot/certbot
 
 COPY . src/certbot-dns-sakuracloud
 
-RUN pip install -r src/certbot-dns-sakuracloud/plugin_dependencies.txt \
-    && pip install --no-cache-dir --editable src/certbot-dns-sakuracloud
+RUN pip install --no-cache-dir --editable src/certbot-dns-sakuracloud
diff --git a/certbot-dns-sakuracloud/plugin_dependencies.txt b/certbot-dns-sakuracloud/plugin_dependencies.txt
deleted file mode 100644
index b6d512fb4..000000000
--- a/certbot-dns-sakuracloud/plugin_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-dns-lexicon==3.0.8
-future==0.16.0
-PyYAML==3.13
-tldextract==2.2.0