Skip to content

Commit

Permalink
Merge branch '5.6.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
lunkwill42 committed Aug 4, 2023
2 parents cc6dc7a + 3775a46 commit 28a30bb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: "Install test runner dependencies"
run: |
set -xe
python -m pip install --upgrade pip setuptools wheel 'tox<4' tox-gh-actions coverage virtualenv snmpsim 'pyasn1<0.5.0'
python -m pip install --upgrade 'pip==23.1.0' setuptools wheel 'tox<4' tox-gh-actions coverage virtualenv snmpsim 'pyasn1<0.5.0'
sudo apt-get install -y nbtscan
# virtualenv seems to currently be embedding a broken version of
Expand All @@ -66,7 +66,9 @@ jobs:
- uses: browser-actions/setup-chrome@latest
- run: chrome --version
- uses: nanasess/setup-chromedriver@master
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: '115.0.5790.170' # https://github.com/nanasess/setup-chromedriver/issues/200

- name: "Set up PostgreSQL"
uses: harmon758/postgresql-action@v1
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ setenv =
LC_ALL=C.UTF-8
LANG=C.UTF-8
PYTHONPATH = {toxinidir}/tests
VIRTUALENV_PIP=23.1.0
BUILDDIR = {envdir}
CHROME_BIN = /usr/bin/google-chrome
DJANGO_SETTINGS_MODULE = nav.django.settings
Expand Down Expand Up @@ -93,6 +94,7 @@ setenv =
PYLINTHOME = {toxinidir}
LC_ALL=C.UTF-8
LANG=C.UTF-8
VIRTUALENV_PIP=23.1.0
commands_pre =
pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt tests/requirements.txt requirements/base.txt requirements/django32.txt
pip-sync {envdir}/requirements.txt
Expand All @@ -107,6 +109,7 @@ setenv =
DJANGO_SETTINGS_MODULE = nav.django.settings
LC_ALL=C.UTF-8
LANG=C.UTF-8
VIRTUALENV_PIP=23.1.0
allowlist_externals = sh
commands_pre =
pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt doc/requirements.txt
Expand Down

0 comments on commit 28a30bb

Please sign in to comment.