Skip to content

Commit 7d568e3

Browse files
authored
Merge pull request #62 from stackhpc/upstream/yoga-2024-12-09
Synchronise yoga with upstream
2 parents c36cb5b + 9ba7b33 commit 7d568e3

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

.gitreview

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
host=review.opendev.org
33
port=29418
44
project=openstack/horizon.git
5-
defaultbranch=stable/yoga
5+
defaultbranch=unmaintained/yoga

.zuul.d/project.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
- horizon-nodejs14-jobs
77
- horizon-non-primary-django-jobs
88
- openstack-python3-yoga-jobs
9-
- periodic-stable-jobs
109
- publish-openstack-docs-pti
1110
- release-notes-jobs-python3
1211
check:
1312
jobs:
1413
- horizon-selenium-headless
1514
- horizon-integration-tests
1615
- horizon-dsvm-tempest-plugin
17-
- horizon-tox-bandit-baseline
16+
- horizon-tox-bandit-baseline:
17+
voting: false
1818
- horizon-tempest-plugin-ipv6
1919
gate:
2020
jobs:
@@ -27,7 +27,3 @@
2727
- horizon-integration-tests-xstatic-master
2828
- horizon-tox-py36-xstatic-master
2929
- horizon-nodejs14-run-test-xstatic-master
30-
periodic:
31-
jobs:
32-
- horizon-nodejs14-run-test
33-
- horizon-integration-tests

tox.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ skipsdist = True
66
# env and ignore basepython inherited from [testenv] if we set
77
# ignore_basepython_conflict.
88
ignore_basepython_conflict = True
9+
# Cap setuptools via virtualenv to prevent compatibility issue with yoga
10+
# branch's upper constraint of 'packaging' package (21.3).
11+
requires =
12+
virtualenv<20.26.4
13+
tox<4
914

1015
[testenv]
1116
basepython = python3

0 commit comments

Comments
 (0)