Browse Source

Merge "Making Python version uniform across all airship components."

Zuul 5 months ago
parent
commit
1c8fd5ce4f
4 changed files with 4 additions and 2 deletions
  1. 1
    1
      Makefile
  2. 1
    1
      images/shipyard/Dockerfile
  3. 1
    0
      src/bin/shipyard_airflow/setup.py
  4. 1
    0
      src/bin/shipyard_client/setup.py

+ 1
- 1
Makefile View File

@@ -29,7 +29,7 @@ PROXY                      ?= http://proxy.foo.com:8000
29 29
 NO_PROXY                   ?= localhost,127.0.0.1,.svc.cluster.local
30 30
 USE_PROXY                  ?= false
31 31
 
32
-PYTHON_BASE_IMAGE          ?= python:3.5
32
+PYTHON_BASE_IMAGE          ?= python:3.6
33 33
 UBUNTU_BASE_IMAGE          ?= ubuntu:16.04
34 34
 
35 35
 IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG}

+ 1
- 1
images/shipyard/Dockerfile View File

@@ -12,7 +12,7 @@
12 12
 # See the License for the specific language governing permissions and
13 13
 # limitations under the License.
14 14
 
15
-ARG FROM=python:3.5
15
+ARG FROM=python:3.6
16 16
 FROM ${FROM}
17 17
 
18 18
 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'

+ 1
- 0
src/bin/shipyard_airflow/setup.py View File

@@ -39,5 +39,6 @@ setuptools.setup(
39 39
         'Programming Language :: Python',
40 40
         'Programming Language :: Python :: 3',
41 41
         'Programming Language :: Python :: 3.5',
42
+        'Programming Language :: Python :: 3.6',
42 43
     ],
43 44
 )

+ 1
- 0
src/bin/shipyard_client/setup.py View File

@@ -34,5 +34,6 @@ setuptools.setup(
34 34
         'Programming Language :: Python',
35 35
         'Programming Language :: Python :: 3',
36 36
         'Programming Language :: Python :: 3.5',
37
+        'Programming Language :: Python :: 3.6',
37 38
     ],
38 39
 )

Loading…
Cancel
Save