summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Wittig <max.wittig@siemens.com>2019-12-18 12:24:36 +0100
committerMax Wittig <max.wittig@siemens.com>2019-12-18 13:50:16 +0100
commitaf8679ac5c2c2b7774d624bdb1981d0e2374edc1 (patch)
treefa8d7b546b5262a221a7124468d3a954bd3c55f6
parent7ecd5184e62bf1b1f377db161b26fa4580af6b4c (diff)
downloadgitlab-af8679ac5c2c2b7774d624bdb1981d0e2374edc1.tar.gz
chore: drop legacy python tests
Support dropped for: 2.7, 3.4, 3.5
-rw-r--r--.travis.yml28
-rw-r--r--Dockerfile4
-rw-r--r--setup.py4
-rw-r--r--tox.ini2
4 files changed, 8 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index b631f21..83d2d33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,50 +21,32 @@ jobs:
- stage: lint
name: black_lint
dist: bionic
- python: 3.7
+ python: 3.8
script:
- pip3 install -U --pre black
- black --check .
- stage: test
name: cli_func_v4
dist: bionic
- python: 3.7
+ python: 3.8
script:
- pip3 install tox
- tox -e cli_func_v4
- stage: test
name: py_func_v4
dist: bionic
- python: 3.7
+ python: 3.8
script:
- pip3 install tox
- tox -e py_func_v4
- stage: test
name: docs
dist: bionic
- python: 3.7
+ python: 3.8
script:
- pip3 install tox
- tox -e docs
- stage: test
- name: py27
- python: 2.7
- script:
- - pip2 install tox
- - tox -e py27
- - stage: test
- name: py34
- python: 3.4
- script:
- - pip3 install tox
- - tox -e py34
- - stage: test
- name: py35
- python: 3.5
- script:
- - pip3 install tox
- - tox -e py35
- - stage: test
name: py36
python: 3.6
dist: bionic
@@ -81,7 +63,7 @@ jobs:
- stage: test
dist: bionic
name: py38
- python: 3.8-dev
+ python: 3.8
script:
- pip3 install tox
- tox -e py38
diff --git a/Dockerfile b/Dockerfile
index 489a420..1eb7f8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM python:3.7-alpine AS build
+FROM python:3.8-alpine AS build
WORKDIR /opt/python-gitlab
COPY . .
RUN python setup.py bdist_wheel
-FROM python:3.7-alpine
+FROM python:3.8-alpine
WORKDIR /opt/python-gitlab
COPY --from=build /opt/python-gitlab/dist dist/
diff --git a/setup.py b/setup.py
index 2eb7009..a363261 100644
--- a/setup.py
+++ b/setup.py
@@ -36,11 +36,7 @@ setup(
"Operating System :: POSIX",
"Operating System :: Microsoft :: Windows",
"Programming Language :: Python",
- "Programming Language :: Python :: 2",
- "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.4",
- "Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
diff --git a/tox.ini b/tox.ini
index db28f6e..0aa43f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = py38,py37,py36,py35,py34,py27,pep8,black
+envlist = py38,py37,py36,pep8,black
[testenv]
setenv = VIRTUAL_ENV={envdir}