Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
vauxoo
gitlab_tools
Commits
684624ae
Commit
684624ae
authored
May 29, 2017
by
Tulio Ruiz
Browse files
Merge branch 'master-update-docker-version-mapuerta' into 'master'
Change import Client to APIClient See merge request !20
parents
b7097778
00cd8568
Pipeline
#5730
passed with stage
in 30 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
setup.py
View file @
684624ae
...
...
@@ -74,7 +74,7 @@ class PyInstall(InstallCommand):
setup
(
name
=
'deployv-addon-gitlab-tools'
,
version
=
'0.1.
4
'
,
version
=
'0.1.
5
'
,
license
=
'BSD'
,
description
=
'Deployv addon: Gitlab tools. Generated by cookiecutter and cookiecutter-deploy-addon.'
,
long_description
=
'%s
\n
%s'
%
(
...
...
src/deployv_addon_gitlab_tools/commands/deployv_tests.py
View file @
684624ae
# coding: utf-8
from
deployv_addon_gitlab_tools.common
import
check_env_vars
from
docker
import
Client
,
errors
from
docker
import
errors
,
APIClient
as
Client
from
os
import
environ
import
re
import
subprocess
...
...
src/deployv_addon_gitlab_tools/commands/test_images.py
View file @
684624ae
...
...
@@ -2,7 +2,7 @@
from
deployv_addon_gitlab_tools.common
import
check_env_vars
from
deployv.helpers
import
utils
from
docker
import
Client
,
errors
from
docker
import
errors
,
APIClient
as
Client
from
os
import
environ
import
re
import
subprocess
...
...
src/deployv_addon_gitlab_tools/commands/upload_image.py
View file @
684624ae
...
...
@@ -2,7 +2,7 @@
from
deployv_addon_gitlab_tools.common
import
check_env_vars
from
deployv.helpers
import
utils
from
docker
import
Client
from
docker
import
APIClient
as
Client
from
os
import
environ
import
subprocess
import
shlex
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment