Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update intro text, upgrade python to avoid pip errors in workflow #608

Merged
merged 3 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 4 additions & 36 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,11 @@ jobs:
test:
name: Run tests
runs-on: ubuntu-20.04
services:
postgres:
image: postgres:10
env:
POSTGRES_DB: bga_payroll
POSTGRES_PASSWORD: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
redis:
image: redis
ports:
- 6379:6379

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.5
uses: actions/setup-python@v2
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.5'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools_scm
pip install -r requirements.txt
npm install -g jshint

- name: Test with pytest
run: |
cp configs/test_settings_deployment.py bga_database/local_settings.py
pytest -sv
jshint bga_database/static/js/*.js
- uses: actions/checkout@v2
- name: Build containers and run tests
run: |
docker compose -f docker-compose.yml -f tests/docker-compose.yml run --rm app
deploy:
if:
contains('
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ RUN mkdir /app
WORKDIR /app

COPY ./requirements.txt /app/requirements.txt
RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

COPY . /app
2 changes: 1 addition & 1 deletion bga_database/local_settings.py.example
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ CELERY_RESULT_SERIALIZER = 'json'
# and we should increase the visibility timeout.

CELERY_TASK_ACKS_LATE = True
CELERY_BROKER_TRANSPORT_OPTIONS = {'visibility_timeout': 3600*5}
CELERY_BROKER_TRANSPORT_OPTIONS = {'visibility_timeout': 3600 * 5}

CENSUS_API_KEY = '<A KEY>'

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ attrs==19.1.0
pytest-django==3.1.2
pytest-mock==1.7.1
locustio==0.9.0
https://github.com/datamade/pytest-flake8/zipball/master
https://github.com/datamade/pytest-flake8/zipball/master
4 changes: 3 additions & 1 deletion templates/jinja2/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
<div class="jumbotron">
<div class="row mb-lg-5">
<div class="col-md align-self-center">
<p class="lead">Every year, the Better Government Association compiles Illinois’ most comprehensive database to review, explore and compare compensation for public employees throughout Illinois. We do this because the BGA believes detailing how tax dollars are spent serves the public interest.</p>
<p class="lead">This database provides information to review, explore and compare compensation for public employees throughout Illinois from 2017 to 2020. We do this because we believe detailing how tax dollars are spent serves the public interest.

</p>
</div>
</div>

Expand Down
Loading