Merge "Drop Django 2.2 support"
This commit is contained in:
commit
7ba6f8519b
@ -17,30 +17,22 @@
|
|||||||
pre-run: playbooks/horizon-tox-django/pre.yaml
|
pre-run: playbooks/horizon-tox-django/pre.yaml
|
||||||
run: playbooks/horizon-tox-django/run.yaml
|
run: playbooks/horizon-tox-django/run.yaml
|
||||||
vars:
|
vars:
|
||||||
tox_envlist: py38
|
tox_envlist: py39
|
||||||
required-projects:
|
required-projects:
|
||||||
- name: openstack/horizon
|
- name: openstack/horizon
|
||||||
|
|
||||||
- job:
|
|
||||||
name: horizon-tox-python3-django32
|
|
||||||
parent: horizon-tox-python3-django
|
|
||||||
vars:
|
|
||||||
django_version: '>=3.2,<3.3'
|
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: horizon-non-primary-django-jobs
|
name: horizon-non-primary-django-jobs
|
||||||
description: |
|
description: |
|
||||||
Run unit tests with non-primary Django versions.
|
Run unit tests with non-primary Django versions.
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
# Currently we only support Django 2.2, so there is no need
|
# Currently we only support Django 3.2, so there is no need
|
||||||
# to run tests with different versions of Django.
|
# to run tests with different versions of Django.
|
||||||
# We specify a job in openstack-python3-yoga-jobs(-horizon)
|
# We specify a job in openstack-python3-yoga-jobs(-horizon)
|
||||||
# to keep this project template as it is used in horizon plugins.
|
# to keep this project template as it is used in horizon plugins.
|
||||||
# NOTE: We keep it as a template even though it is not used now.
|
# NOTE: We keep it as a template even though it is not used now.
|
||||||
- openstack-tox-py38
|
- openstack-tox-py39
|
||||||
- horizon-tox-python3-django32
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-py38
|
- openstack-tox-py39
|
||||||
- horizon-tox-python3-django32
|
|
||||||
|
@ -107,11 +107,10 @@ when a test fails you can use::
|
|||||||
|
|
||||||
$ tox -e py37 -- --pdb
|
$ tox -e py37 -- --pdb
|
||||||
|
|
||||||
py3-dj111, py3-dj21, py3-dj22
|
py3-dj32
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
||||||
Runs the Python unit tests against Django 1.11, Django 2.1 and Django 2.2
|
Runs the Python unit tests against Django 3.2.
|
||||||
respectively
|
|
||||||
|
|
||||||
py36
|
py36
|
||||||
----
|
----
|
||||||
|
@ -6,10 +6,8 @@ The Ussuri release of horizon has the following dependencies.
|
|||||||
|
|
||||||
* Python 3.6 or 3.7
|
* Python 3.6 or 3.7
|
||||||
|
|
||||||
* Django 2.2
|
* Django 3.2
|
||||||
|
|
||||||
* Django 3.2 support is experimental as of Xena release.
|
|
||||||
(Yoga release will use Django 3.2 as the primary Django version.)
|
|
||||||
* Django support policy is documented at :ref:`django_support`.
|
* Django support policy is documented at :ref:`django_support`.
|
||||||
|
|
||||||
* An accessible `keystone <https://docs.openstack.org/keystone/latest/>`_ endpoint
|
* An accessible `keystone <https://docs.openstack.org/keystone/latest/>`_ endpoint
|
||||||
|
@ -15,7 +15,7 @@ cryptography==3.0
|
|||||||
debtcollector==1.2.0
|
debtcollector==1.2.0
|
||||||
decorator==4.4.2
|
decorator==4.4.2
|
||||||
deprecation==1.0
|
deprecation==1.0
|
||||||
Django==2.2
|
Django==3.2
|
||||||
django-appconf==1.0.5
|
django-appconf==1.0.5
|
||||||
django-compressor==2.4.1
|
django-compressor==2.4.1
|
||||||
django-debreach==1.4.2
|
django-debreach==1.4.2
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Django 2.2 support was dropped. Django 2.2 ends its extended support
|
||||||
|
in April 2022. Considering this horizon dropped Django 2.2 support
|
||||||
|
and uses Django 3.2 as default.
|
@ -12,7 +12,7 @@ pbr>=5.5.0 # Apache-2.0
|
|||||||
# Horizon Core Requirements
|
# Horizon Core Requirements
|
||||||
Babel>=2.6.0 # BSD
|
Babel>=2.6.0 # BSD
|
||||||
debtcollector>=1.2.0 # Apache-2.0
|
debtcollector>=1.2.0 # Apache-2.0
|
||||||
Django>=2.2,<3.3 # BSD
|
Django>=3.2,<3.3 # BSD
|
||||||
django-compressor>=2.4.1 # MIT
|
django-compressor>=2.4.1 # MIT
|
||||||
django-debreach>=1.4.2 # BSD License (2 clause)
|
django-debreach>=1.4.2 # BSD License (2 clause)
|
||||||
django-pyscss>=2.0.2 # BSD License (2 clause)
|
django-pyscss>=2.0.2 # BSD License (2 clause)
|
||||||
|
Loading…
Reference in New Issue
Block a user