diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9ebe3762b..c7a6650c0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -25,6 +25,6 @@ dispatcher where…", "Improve our handling of…", etc. ## Tests and Linting - - [ ] This branch is up-to-date with the `develop` branch. - - [ ] `pytest` passes on my local development environment. - - [ ] `pre-commit` passes on my local development environment. +- [ ] This branch is up-to-date with the `develop` branch. +- [ ] `pytest` passes on my local development environment. +- [ ] `pre-commit` passes on my local development environment. diff --git a/CONTRIB.md b/CONTRIB.md index 143635dc5..8af00f0cc 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -151,7 +151,6 @@ From here on out, we'll be using the Flask CLI. First we need to 'stamp' the cur ```shell $ docker exec -it openoversight-web-1 bash # 'openoversight-web-1' is the name of the app container seen in the step above $ flask db stamp head -$ flask db migrate -m "[THE NAME OF YOUR MIGRATION IN ALL LOWER CASE]" # NOTE: Slugs are limited to 40 characters and will be truncated after the limit ``` (Hint: If you get errors when running `flask` commands, e.g. because of differing Python versions, you may need to run the commands in the docker container by prefacing them as so: `docker exec -it openoversight_web_1 flask db stamp head`) @@ -159,7 +158,7 @@ $ flask db migrate -m "[THE NAME OF YOUR MIGRATION IN ALL LOWER CASE]" # NOTE: S Next make your changes to the database models in `OpenOversight/app/models/database.py`. You'll then generate the migrations: ```shell -$ flask db migrate -m "[THE NAME OF YOUR MIGRATION IN ALL LOWER CASE]" +$ flask db migrate -m "[THE NAME OF YOUR MIGRATION IN ALL LOWER CASE]" # NOTE: Slugs are limited to 40 characters and will be truncated after the limit ``` And then you should inspect/edit the migrations. You can then apply the migrations: diff --git a/OpenOversight/app/commands.py b/OpenOversight/app/commands.py index 5a230f663..991d02585 100644 --- a/OpenOversight/app/commands.py +++ b/OpenOversight/app/commands.py @@ -501,7 +501,6 @@ def bulk_add_officers(filename, no_create, update_by_name, update_static_fields) for row in csvfile: department_id = row["department_id"] - department = departments.get(department_id) if row["department_id"] not in departments: department = Department.query.filter_by(id=department_id).one_or_none() if department: