diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aa8b5219d55a981baa6ef748be1799f20fa5f67..80c01609745d25df4257453b26d97f262dcba41d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,6 @@ stages: - build - deploy -py27-django111: - image: python:2.7 - stage: test - before_script: - - pip install tox - script: tox -e py27-django111 - py34-django111: image: python:3.4 stage: test @@ -39,13 +32,6 @@ py37-django111: - pip install tox 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: image: python:3.4 stage: test diff --git a/setup.py b/setup.py index 663619d60a48553eb51c86af1f3c06c17ff40993..f53e955a4938c5f37f9144053a38a6352eca5608 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,6 @@ setup( # 'Framework :: Django :: 1.10', # 'Framework :: Django :: 1.11', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', @@ -68,7 +67,7 @@ setup( 'django-hope', ], install_requires=[ - # eg: 'aspectlib==1.1.1', 'six>=1.7', + 'django-cerberus-ac' ], extras_require={ # eg: diff --git a/tox.ini b/tox.ini index 5f7761f5ff557a48d7c1585829cf0da2547cc147..ad1269ba4bed98ef55f372abf32fd616b4cc26bf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,6 @@ [tox] envlist = clean,setup,safety,style,docs, - py27-django111, - py27-django20, py34-django111, py34-django20, py35-django111, @@ -32,7 +30,7 @@ whitelist_externals = tox [testenv:test] description = Run all the Python/Django test environments. 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 [testenv:dtest] @@ -40,7 +38,7 @@ description = Run all the Python/Django test environments in parallel. skip_install = true deps = detox 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 [testenv:detox] @@ -48,7 +46,7 @@ description = Run all the environments in parallel. skip_install = true deps = detox 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 [testenv:check]