Skip to content

Commit

Permalink
Merge branch 'dev' into issue6397
Browse files Browse the repository at this point in the history
  • Loading branch information
philippemilink authored May 27, 2023
2 parents 0444649 + cf48c6f commit 4dd6a27
Show file tree
Hide file tree
Showing 231 changed files with 546 additions and 895 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:
PYTHON_VERSION: "3.7"
MARIADB_VERSION: "10.4.10"
COVERALLS_VERSION: "3.3.1" # check if Coverage needs to be also updated in requirements-ci.txt
BLACK_VERSION: "22.8.0" # needs to be also updated in requirements-dev.txt and .pre-commit-config.yaml
GECKODRIVER_VERSION: "0.31.0"
BLACK_VERSION: "23.3.0" # needs to be also updated in requirements-dev.txt and .pre-commit-config.yaml
GECKODRIVER_VERSION: "0.33.0"

# As GitHub Action does not allow environment variables
# to be used in services definitions, these are only for
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.37.3
rev: v3.4.0
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/psf/black
rev: 22.8.0 # needs to be also updated in requirements-dev.txt and .github/workflows/ci.yml
rev: 23.3.0 # needs to be also updated in requirements-dev.txt and .github/workflows/ci.yml
hooks:
- id: black
language_version: python3
2 changes: 1 addition & 1 deletion assets/scss/base/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ h6 {
position: absolute;
top: 50%;
left: $length-16;
margin: -$length-12 0 0 -$length-12;
margin: (-$length-12) 0 0 (-$length-12);
height: 22px;
width: 22px;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/components/_content-item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ $content-item-padding-vertical: $length-14;
flex-wrap: wrap;
justify-content: space-between;
min-width: 100%; // prevents some weird margin bug...
margin: 0 -$length-10;
margin: 0 (-$length-10);

@include until-desktop {
margin: 0;
Expand Down
1 change: 0 additions & 1 deletion manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ def sighandler(signum, frame):
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "zds.settings.dev")

if len(sys.argv) > 1 and sys.argv[1] in ["migrate", "test"]:

from django.db.backends.mysql.creation import BaseDatabaseCreation

BaseDatabaseCreation.sql_table_creation_suffix = patch_create_suffix(
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,33 @@
},
"homepage": "https://github.com/zestedesavoir/zds-site",
"dependencies": {
"autoprefixer": "10.4.13",
"autoprefixer": "10.4.14",
"chart.js": "3.9.1",
"chartjs-adapter-moment": "1.0.1",
"cssnano": "5.1.14",
"cssnano": "6.0.1",
"del": "6.1.1",
"easymde": "2.18.0",
"gulp": "4.0.2",
"gulp-concat": "2.6.1",
"gulp-dart-sass": "1.0.2",
"gulp-dart-sass": "1.1.0",
"gulp-if": "3.0.0",
"gulp-imagemin": "7.1.0",
"gulp-options": "1.1.1",
"gulp-postcss": "9.0.1",
"gulp-terser-js": "5.2.2",
"gulp.spritesmith": "6.13.0",
"jquery": "3.6.3",
"jquery": "3.7.0",
"moment": "2.29.4",
"normalize.css": "8.0.1",
"postcss": "8.4.21"
"postcss": "8.4.23"
},
"devDependencies": {
"david": "12.0.0",
"eslint": "8.31.0",
"eslint": "8.41.0",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsdoc": "39.6.4",
"eslint-plugin-n": "15.6.1",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsdoc": "44.2.5",
"eslint-plugin-n": "16.0.0",
"eslint-plugin-promise": "6.1.1"
},
"browserslist": [
Expand Down
16 changes: 8 additions & 8 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
-r requirements.txt

black==22.8.0 # needs to be also updated in .github/workflows/ci.yml and .pre-commit-config.yaml
black==23.3.0 # needs to be also updated in .github/workflows/ci.yml and .pre-commit-config.yaml
colorlog==6.7.0
django-debug-toolbar==3.6.0
django-extensions==3.2.0
Faker==14.2.0
pre-commit==2.20.0
django-debug-toolbar==3.8.1
django-extensions==3.2.1
Faker==18.9.0
pre-commit==2.21.0
PyYAML==6.0
selenium==4.4.3
Sphinx==5.1.1
sphinx-rtd-theme==1.0.0
selenium==4.9.1
Sphinx==5.3.0
sphinx-rtd-theme==1.2.1
28 changes: 14 additions & 14 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# Implicit dependencies (optional dependencies of dependencies)
elasticsearch-dsl==5.4.0
elasticsearch==5.5.3
social-auth-app-django==5.0.0
social-auth-app-django==5.2.0

# Explicit dependencies (references in code)
beautifulsoup4==4.11.1
beautifulsoup4==4.12.2
django-crispy-forms==1.14.0
django-model-utils==4.2.0
django-model-utils==4.3.1
django-munin==0.2.1
django-recaptcha==3.0.0
Django==3.2.15
Django==3.2.19
easy-thumbnails[svg]==2.8.3
factory-boy==3.2.1
geoip2==4.6.0
GitPython==3.1.27
geoip2==4.7.0
GitPython==3.1.31
homoglyphs==2.0.4
lxml==4.9.1
Pillow==9.2.0
pymemcache==3.5.2
requests==2.28.1
lxml==4.9.2
Pillow==9.5.0
pymemcache==4.0.0
requests==2.31.0

# Api dependencies
django-cors-headers==3.13.0
django-filter==22.1
django-cors-headers==4.0.0
django-filter==23.2
django-oauth-toolkit==1.7.0
djangorestframework==3.14.0
drf-extensions==0.7.1
dry-rest-permissions==0.1.10
drf-yasg==1.21.4
drf-yasg==1.21.5

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

# tomllib was added to the standard library in Python 3.11
# tomli is only needed for older Python versions
Expand Down
Loading

0 comments on commit 4dd6a27

Please sign in to comment.