Skip to content

Commit 2046014

Browse files
committed
ref(requirements.txt): remove paramiko library
This was used only by the dearly departed fleet.py scheduler.
1 parent 79c2424 commit 2046014

4 files changed

Lines changed: 3 additions & 5 deletions

File tree

_scripts/ci/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Build and push Docker images to Docker Hub and quay.io.
44
#
55

6-
cd "$(dirname "$0")"
6+
cd "$(dirname "$0")" || exit 1
77

88
docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker.io
99
REGISTRY=docker.io IMAGE_PREFIX=deisci BUILD_TAG=v2-alpha make -C ../.. docker-build docker-push

docs/docs_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ django-json-field==0.5.7
1313
djangorestframework==3.0.5
1414
docker-py==1.5.0
1515
gunicorn==19.3.0
16-
paramiko==1.15.2
1716
python-etcd==0.3.2
1817
PyYAML==3.11
1918
semantic_version==2.4.2

rootfs/registry/dockerclient.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def tag(self, image, repo, tag):
9090
def check_blacklist(repo):
9191
"""Check a Docker repository name for collision with deis/* components."""
9292
blacklisted = [ # NOTE: keep this list up to date!
93-
'builder', 'database', 'dockerbuilder', 'etcd', 'minio', 'registry', 'router',
94-
'slugbuilder', 'slugrunner', 'workflow',
93+
'builder', 'controller', 'database', 'dockerbuilder', 'etcd', 'minio', 'registry',
94+
'router', 'slugbuilder', 'slugrunner', 'workflow',
9595
]
9696
if any("deis/{}".format(c) in repo for c in blacklisted):
9797
raise PermissionDenied("Repository name {} is not allowed".format(repo))

rootfs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ django-auth-ldap==1.2.5
1010
djangorestframework==3.0.5
1111
docker-py==1.5.0
1212
gunicorn==19.3.0
13-
paramiko==1.15.2
1413
psycopg2==2.6.1
1514
python-etcd==0.3.2
1615
python-ldap==2.4.19

0 commit comments

Comments
 (0)