Skip to content

Commit

Permalink
Apply updates from cookiecutter
Browse files Browse the repository at this point in the history
This automated commit applies the latest updates from our cookiecutters [1] to
this repo.

[1]: https://github.com/hypothesis/cookiecutters
  • Loading branch information
github-actions[bot] authored and seanh committed Jun 13, 2024
1 parent 5f99c41 commit 341f1d8
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 6 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,23 @@ jobs:
lint-${{ runner.os }}-tox-
- run: python -m pip install 'tox<4'
- run: tox -e lint
Typecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Cache the .tox dir
uses: actions/cache@v3
with:
path: .tox
key: typecheck-${{ runner.os }}-tox-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements/*') }}
restore-keys: |
typecheck-${{ runner.os }}-tox-
- run: python -m pip install 'tox<4'
- run: tox -e typecheck
Tests:
runs-on: ubuntu-latest
services:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ functests: python
$(call help,make sure,"make sure that the formatting$(comma) linting and tests all pass")
sure: python
sure:
@pyenv exec tox --parallel -qe 'checkformatting,lint,tests,coverage,functests'
@pyenv exec tox --parallel -qe 'checkformatting,lint,typecheck,tests,coverage,functests'

# Tell make how to compile requirements/*.txt files.
#
Expand Down
4 changes: 3 additions & 1 deletion conf/gunicorn-dev.conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from glob import glob

bind = "0.0.0.0:9800"
reload = True
reload_extra_files = "test_pyramid_app/templates"
reload_extra_files = glob("test_pyramid_app/templates/**/*", recursive=True)
timeout = 0
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
environment:
- discovery.type=single-node
rabbit:
image: rabbitmq:3.12-management-alpine
image: rabbitmq:3.6-management-alpine
ports:
- '127.0.0.1:5675:5672'
- '127.0.0.1:15675:15672'
4 changes: 2 additions & 2 deletions requirements/lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ amqp==5.1.1
# -r requirements/functests.txt
# -r requirements/tests.txt
# kombu
astroid==3.1.0
astroid==3.2.2
# via pylint
beautifulsoup4==4.11.1
# via
Expand Down Expand Up @@ -258,7 +258,7 @@ pyjwt==2.6.0
# -r requirements/functests.txt
# -r requirements/tests.txt
# pyramid-googleauth
pylint==3.1.0
pylint==3.2.3
# via -r requirements/lint.in
pyproject-hooks==1.0.0
# via
Expand Down
2 changes: 1 addition & 1 deletion test_pyramid_app/scripts/init_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def main():
stamped = is_stamped(engine)

if args.create:
if stamped:
if stamped: # pylint:disable=possibly-used-before-assignment
log.warning("Not creating tables because the DB is stamped by Alembic")
else:
create(engine)
Expand Down

0 comments on commit 341f1d8

Please sign in to comment.