Skip to content

Commit

Permalink
Merge branch 'dev' into nodejs-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
philippemilink committed Mar 9, 2024
2 parents 68be301 + 4d4b5b0 commit 30ef5d3
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
rev: v3.15.1
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.12.1 # needs to be also updated in requirements-dev.txt
rev: 24.2.0 # needs to be also updated in requirements-dev.txt
hooks:
- id: black
language_version: python3
Expand Down
12 changes: 6 additions & 6 deletions requirements-dev.txt
@@ -1,12 +1,12 @@
-r requirements.txt

black==23.12.1 # needs to be also updated in .pre-commit-config.yaml
colorlog==6.8.0
django-debug-toolbar==4.2.0
black==24.2.0 # needs to be also updated in .pre-commit-config.yaml
colorlog==6.8.2
django-debug-toolbar==4.3.0
django-extensions==3.2.3
Faker==22.2.0
pre-commit==3.6.0
Faker==24.1.0
pre-commit==3.6.2
PyYAML==6.0.1
selenium==4.16.0
selenium==4.18.1
Sphinx==7.2.6
sphinx-rtd-theme==2.0.0
4 changes: 2 additions & 2 deletions requirements-prod.txt
@@ -1,6 +1,6 @@
-r requirements.txt

gunicorn==21.2.0
mysqlclient==2.2.1
sentry-sdk==1.39.2
mysqlclient==2.2.4
sentry-sdk==1.41.0
ujson==5.9.0
14 changes: 7 additions & 7 deletions requirements.txt
Expand Up @@ -5,15 +5,15 @@ elasticsearch==5.5.3
social-auth-app-django==5.4.0

# Explicit dependencies (references in code)
beautifulsoup4==4.12.2
django-crispy-forms==2.0
django-model-utils==4.3.1
beautifulsoup4==4.12.3
django-crispy-forms==2.1
django-model-utils==4.4.0
django-recaptcha==4.0.0
Django==4.2.6
Django==4.2.11
easy-thumbnails[svg]==2.8.5
factory-boy==3.3.0
geoip2==4.8.0
GitPython==3.1.41
GitPython==3.1.42
homoglyphs==2.0.4
lxml==5.1.0
Pillow==10.2.0
Expand All @@ -22,7 +22,7 @@ requests==2.31.0

# Api dependencies
django-cors-headers==4.3.1
django-filter==23.5
django-filter==24.1
django-oauth-toolkit==2.3.0
djangorestframework==3.14.0
drf-extensions==0.7.1
Expand All @@ -31,7 +31,7 @@ drf-yasg==1.21.7

# Dependencies for slug generation, please be extra careful with those
django-uuslug==2.0.0
python-slugify==8.0.1
python-slugify==8.0.4

# tomllib was added to the standard library in Python 3.11
# tomli is only needed for older Python versions
Expand Down
1 change: 0 additions & 1 deletion zds/gallery/forms.py
Expand Up @@ -219,7 +219,6 @@ def clean(self):


class ImageAsAvatarForm(forms.Form):

"""Form to add current image as avatar"""

def __init__(self, *args, **kwargs):
Expand Down
1 change: 0 additions & 1 deletion zds/mp/models.py
Expand Up @@ -486,7 +486,6 @@ def has_object_update_permission(self, request):


class PrivatePostVote(models.Model):

"""Set of Private Post votes."""

class Meta:
Expand Down
1 change: 0 additions & 1 deletion zds/pages/admin.py
Expand Up @@ -4,7 +4,6 @@


class GroupContactAdmin(admin.ModelAdmin):

"""Representation of GroupContact model in the admin interface."""

raw_id_fields = ("persons_in_charge",)
Expand Down
1 change: 0 additions & 1 deletion zds/tutorialv2/mixins.py
Expand Up @@ -295,7 +295,6 @@ def __init__(self, url, *args, **kwargs):


class SingleOnlineContentViewMixin(ContentTypeMixin):

"""
Base mixin to get only one content online content
Expand Down
1 change: 0 additions & 1 deletion zds/tutorialv2/models/help_requests.py
Expand Up @@ -6,7 +6,6 @@


class HelpWriting(models.Model):

"""Tutorial Help"""

class Meta:
Expand Down
5 changes: 0 additions & 5 deletions zds/utils/models.py
Expand Up @@ -112,7 +112,6 @@ def get_parent_category(self):


class CategorySubCategory(models.Model):

"""ManyToMany between Category and SubCategory but save a boolean to know
if category is his main category."""

Expand All @@ -133,7 +132,6 @@ def __str__(self):


class Licence(models.Model):

"""Publication licence."""

class Meta:
Expand Down Expand Up @@ -368,7 +366,6 @@ def get_hat_to_add(hat_name, user):


class Comment(models.Model):

"""Comment in forum, articles, tutorial, chapter, etc."""

class Meta:
Expand Down Expand Up @@ -741,7 +738,6 @@ class Meta:


class CommentVote(models.Model):

"""Set of comment votes."""

class Meta:
Expand All @@ -758,7 +754,6 @@ def __str__(self):


class Tag(models.Model):

"""Set of tags."""

class Meta:
Expand Down

0 comments on commit 30ef5d3

Please sign in to comment.