Commit 80589339 authored by Timothée Mazzucotelli's avatar Timothée Mazzucotelli

Merge branch '3-drop-python-2-support' into '2-move-code-from-cookiecutter'

Resolve "Drop Python 2 support" (#3)

See merge request !3
parents 819c4205 1ee8e273
Pipeline #1582 passed with stages
in 5 minutes and 53 seconds
...@@ -4,13 +4,6 @@ stages: ...@@ -4,13 +4,6 @@ stages:
- build - build
- deploy - deploy
py27-django111:
image: python:2.7
stage: test
before_script:
- pip install tox
script: tox -e py27-django111
py34-django111: py34-django111:
image: python:3.4 image: python:3.4
stage: test stage: test
...@@ -39,13 +32,6 @@ py37-django111: ...@@ -39,13 +32,6 @@ py37-django111:
- pip install tox - pip install tox
script: tox -e py37-dev-django111 script: tox -e py37-dev-django111
py27-django20:
image: python:2.7
stage: test
before_script:
- pip install tox
script: tox -e py27-django20
py34-django20: py34-django20:
image: python:3.4 image: python:3.4
stage: test stage: test
......
...@@ -56,7 +56,6 @@ setup( ...@@ -56,7 +56,6 @@ setup(
# 'Framework :: Django :: 1.10', # 'Framework :: Django :: 1.10',
# 'Framework :: Django :: 1.11', # 'Framework :: Django :: 1.11',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
...@@ -68,7 +67,7 @@ setup( ...@@ -68,7 +67,7 @@ setup(
'django-hope', 'django-hope',
], ],
install_requires=[ install_requires=[
# eg: 'aspectlib==1.1.1', 'six>=1.7', 'django-cerberus-ac'
], ],
extras_require={ extras_require={
# eg: # eg:
......
[tox] [tox]
envlist = envlist =
clean,setup,safety,style,docs, clean,setup,safety,style,docs,
py27-django111,
py27-django20,
py34-django111, py34-django111,
py34-django20, py34-django20,
py35-django111, py35-django111,
...@@ -32,7 +30,7 @@ whitelist_externals = tox ...@@ -32,7 +30,7 @@ whitelist_externals = tox
[testenv:test] [testenv:test]
description = Run all the Python/Django test environments. description = Run all the Python/Django test environments.
skip_install = true skip_install = true
commands = tox -e py27-django111,py27-django20,py34-django111,py34-django20,py35-django111,py35-django20,py36-django111,py36-django20,py37-dev-django111,py37-dev-django20,pypy-django18,pypy-django19,pypy-django111,pypy-django20, commands = tox -e py34-django111,py34-django20,py35-django111,py35-django20,py36-django111,py36-django20,py37-dev-django111,py37-dev-django20,pypy-django18,pypy-django19,pypy-django111,pypy-django20,
tox -e report tox -e report
[testenv:dtest] [testenv:dtest]
...@@ -40,7 +38,7 @@ description = Run all the Python/Django test environments in parallel. ...@@ -40,7 +38,7 @@ description = Run all the Python/Django test environments in parallel.
skip_install = true skip_install = true
deps = detox deps = detox
commands = commands =
detox -e py27-django111,py27-django20,py34-django111,py34-django20,py35-django111,py35-django20,py36-django111,py36-django20,py37-dev-django111,py37-dev-django20,pypy-django18,pypy-django19,pypy-django111,pypy-django20, detox -e py34-django111,py34-django20,py35-django111,py35-django20,py36-django111,py36-django20,py37-dev-django111,py37-dev-django20,pypy-django18,pypy-django19,pypy-django111,pypy-django20,
tox -e report tox -e report
[testenv:detox] [testenv:detox]
...@@ -48,7 +46,7 @@ description = Run all the environments in parallel. ...@@ -48,7 +46,7 @@ description = Run all the environments in parallel.
skip_install = true skip_install = true
deps = detox deps = detox
commands = commands =
detox -e clean,setup,safety,style,docs,py27-django111,py27-django20,py34-django111,py34-django20,py35-django111,py35-django20,py36-django111,py36-django20,py37-dev-django111,py37-dev-django20,pypy-django18,pypy-django19,pypy-django111,pypy-django20, detox -e clean,setup,safety,style,docs,py34-django111,py34-django20,py35-django111,py35-django20,py36-django111,py36-django20,py37-dev-django111,py37-dev-django20,pypy-django18,pypy-django19,pypy-django111,pypy-django20,
tox -e report tox -e report
[testenv:check] [testenv:check]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment