Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
fix: Bump django from 2.2.22 to 2.2.24 (#1540)
Browse files Browse the repository at this point in the history
* Bump django from 2.2.21 to 2.2.24

Bumps [django](https://github.com/django/django) from 2.2.21 to 2.2.24.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@2.2.21...2.2.24)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Merge branch 'development' into dependabot/pip/django-2.2.24

* Running Black formatter as dummy commit
  • Loading branch information
dependabot[bot] authored Jun 11, 2021
1 parent fc7adaa commit b29143a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion aimmo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
if os.environ.get("RUN_MAIN", None) != "true":
default_app_config = "aimmo.apps.AimmoAppConfig"

__version__ = '0.69.10b450'
__version__ = "0.69.10b450"
6 changes: 3 additions & 3 deletions aimmo/migrations/0022_allow_games_to_have_no_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
class Migration(migrations.Migration):

dependencies = [
('aimmo', '0021_add_pdf_names_to_worksheet'),
("aimmo", "0021_add_pdf_names_to_worksheet"),
]

operations = [
migrations.AlterField(
model_name='game',
name='name',
model_name="game",
name="name",
field=models.CharField(blank=True, max_length=100, null=True),
),
]
14 changes: 7 additions & 7 deletions aimmo/migrations/0023_remove_level_attempt.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
class Migration(migrations.Migration):

dependencies = [
('aimmo', '0022_allow_games_to_have_no_name'),
("aimmo", "0022_allow_games_to_have_no_name"),
]

operations = [
migrations.AlterUniqueTogether(
name='levelattempt',
name="levelattempt",
unique_together=set(),
),
migrations.RemoveField(
model_name='levelattempt',
name='game',
model_name="levelattempt",
name="game",
),
migrations.RemoveField(
model_name='levelattempt',
name='user',
model_name="levelattempt",
name="user",
),
migrations.DeleteModel(
name='LevelAttempt',
name="LevelAttempt",
),
]
4 changes: 3 additions & 1 deletion aimmo/templatetags/players_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ def get_user_playable_games(context, base_url):
if logged_in_as_student(user):
playable_games = user.userprofile.student.class_field.game
elif logged_in_as_teacher(user):
playable_games = Game.objects.filter(game_class__teacher=user.userprofile.teacher)
playable_games = Game.objects.filter(
game_class__teacher=user.userprofile.teacher
)
else:
playable_games = Game.objects.none()
return {
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
package_dir={"aimmo": "aimmo"},
include_package_data=True,
install_requires=[
"django==2.2.22",
"django==2.2.24",
"django-js-reverse==0.9.1",
"djangorestframework==3.12.2",
"eventlet==0.31.0",
Expand Down

0 comments on commit b29143a

Please sign in to comment.