Skip to content

Commit

Permalink
Merge pull request #62 from stackhpc/upstream/yoga-2024-12-09
Browse files Browse the repository at this point in the history
Synchronise yoga with upstream
  • Loading branch information
priteau authored Dec 13, 2024
2 parents c36cb5b + 9ba7b33 commit 7d568e3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitreview
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/horizon.git
defaultbranch=stable/yoga
defaultbranch=unmaintained/yoga
8 changes: 2 additions & 6 deletions .zuul.d/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
- horizon-nodejs14-jobs
- horizon-non-primary-django-jobs
- openstack-python3-yoga-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
check:
jobs:
- horizon-selenium-headless
- horizon-integration-tests
- horizon-dsvm-tempest-plugin
- horizon-tox-bandit-baseline
- horizon-tox-bandit-baseline:
voting: false
- horizon-tempest-plugin-ipv6
gate:
jobs:
Expand All @@ -27,7 +27,3 @@
- horizon-integration-tests-xstatic-master
- horizon-tox-py36-xstatic-master
- horizon-nodejs14-run-test-xstatic-master
periodic:
jobs:
- horizon-nodejs14-run-test
- horizon-integration-tests
5 changes: 5 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ skipsdist = True
# env and ignore basepython inherited from [testenv] if we set
# ignore_basepython_conflict.
ignore_basepython_conflict = True
# Cap setuptools via virtualenv to prevent compatibility issue with yoga
# branch's upper constraint of 'packaging' package (21.3).
requires =
virtualenv<20.26.4
tox<4

[testenv]
basepython = python3
Expand Down

0 comments on commit 7d568e3

Please sign in to comment.