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.

Sign up for GitHub

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

Jump to bottom

Upgrading packing #456

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −70
Open

Upgrading packing #456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be00ba9
chore: upgrading packages and fixing tests.
awais786 Dec 4, 2023
cd4aee8
chore: fixing tests.
awais786 Dec 4, 2023
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
5 changes: 3 additions & 2 deletions repo_health/check_django_dependencies_compatibility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ def get_upgraded_dependencies_count(repo_path, django_dependency_sheet) -> tuple
package_name = line["Django Package Name"]
if package_name in deps.keys(): # pylint: disable=consider-iterating-dictionary
django_deps.append(package_name)

if line["Django 3.2"] and line["Django 3.2"] != '-':
# If the package support is included in the master branch but hasn't been released,
# it won't be regarded as a supported version.
if line["Django 3.2"] and line["Django 3.2"] not in ['-', 'master']:
deps_support_django32.append(package_name)

if parse(deps[package_name]) >= parse(line["Django 3.2"]):
Expand Down
10 changes: 3 additions & 7 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,8 @@ multidict==6.0.4
# yarl
oauthlib==3.2.2
# via requests-oauthlib
packaging==21.3
# via
# -c requirements/constraints.txt
# pytest
packaging==23.2
# via pytest
pluggy==1.3.0
# via pytest
pyasn1==0.5.1
Expand All @@ -68,16 +66,14 @@ pyasn1==0.5.1
# rsa
pyasn1-modules==0.3.0
# via google-auth
pyparsing==3.1.1
# via packaging
pytest==7.4.3
# via
# pytest-aiohttp
# pytest-asyncio
# pytest-repo-health
pytest-aiohttp==1.0.5
# via pytest-repo-health
pytest-asyncio==0.21.1
pytest-asyncio==0.23.2
# via
# -r requirements/base.in
# pytest-aiohttp
Expand Down
12 changes: 4 additions & 8 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,23 @@ filelock==3.13.1
# via
# tox
# virtualenv
packaging==21.3
packaging==23.2
# via
# -c requirements/constraints.txt
# pyproject-api
# tox
platformdirs==3.11.0
platformdirs==4.0.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# tox
# virtualenv
pluggy==1.3.0
# via tox
pyparsing==3.1.1
# via packaging
pyproject-api==1.5.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.0.0
tox==4.11.4
# via -r requirements/ci.in
virtualenv==20.25.0
# via tox
5 changes: 1 addition & 4 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
# This file contains all common constraints for edx-repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# greater version breaking test.
packaging==21.3

# gspread==5.12.0 contains breaking changes
# gspread==5.12.0 contains breaking changes
# which break the scheduled repo health job
gspread<5.12.0
20 changes: 6 additions & 14 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ idna==3.6
# -r requirements/quality.txt
# requests
# yarl
importlib-metadata==6.9.0
importlib-metadata==7.0.0
# via
# -r requirements/pip-tools.txt
# build
Expand Down Expand Up @@ -176,9 +176,8 @@ oauthlib==3.2.2
# via
# -r requirements/quality.txt
# requests-oauthlib
packaging==21.3
packaging==23.2
# via
# -c requirements/constraints.txt
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand All @@ -192,9 +191,8 @@ pbr==6.0.0
# stevedore
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.11.0
platformdirs==4.0.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# -r requirements/quality.txt
# pylint
Expand Down Expand Up @@ -244,13 +242,7 @@ pylint-plugin-utils==0.8.2
# -r requirements/quality.txt
# pylint-celery
# pylint-django
pyparsing==3.1.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# packaging
pyproject-api==1.5.0
pyproject-api==1.6.1
# via
# -r requirements/ci.txt
# tox
Expand All @@ -269,7 +261,7 @@ pytest-aiohttp==1.0.5
# via
# -r requirements/quality.txt
# pytest-repo-health
pytest-asyncio==0.21.1
pytest-asyncio==0.23.2
# via
# -r requirements/quality.txt
# pytest-aiohttp
Expand Down Expand Up @@ -349,7 +341,7 @@ tomlkit==0.12.3
# via
# -r requirements/quality.txt
# pylint
tox==4.0.0
tox==4.11.4
# via -r requirements/ci.txt
typing-extensions==4.8.0
# via
Expand Down
11 changes: 3 additions & 8 deletions requirements/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ idna==3.6
# yarl
imagesize==1.4.1
# via sphinx
importlib-metadata==6.9.0
importlib-metadata==7.0.0
# via sphinx
iniconfig==2.0.0
# via
Expand All @@ -119,9 +119,8 @@ oauthlib==3.2.2
# via
# -r requirements/test.txt
# requests-oauthlib
packaging==21.3
packaging==23.2
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# pydata-sphinx-theme
# pytest
Expand Down Expand Up @@ -150,10 +149,6 @@ pygments==2.17.2
# pydata-sphinx-theme
# readme-renderer
# sphinx
pyparsing==3.1.1
# via
# -r requirements/test.txt
# packaging
pytest==7.4.3
# via
# -r requirements/test.txt
Expand All @@ -165,7 +160,7 @@ pytest-aiohttp==1.0.5
# via
# -r requirements/test.txt
# pytest-repo-health
pytest-asyncio==0.21.1
pytest-asyncio==0.23.2
# via
# -r requirements/test.txt
# pytest-aiohttp
Expand Down
10 changes: 3 additions & 7 deletions requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@ build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.9.0
importlib-metadata==7.0.0
# via build
packaging==23.2
# via build
packaging==21.3
# via
# -c requirements/constraints.txt
# build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
pyparsing==3.1.1
# via packaging
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
Expand Down
15 changes: 4 additions & 11 deletions requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,14 @@ oauthlib==3.2.2
# via
# -r requirements/test.txt
# requests-oauthlib
packaging==21.3
packaging==23.2
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# pytest
pbr==6.0.0
# via stevedore
platformdirs==3.11.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# pylint
platformdirs==4.0.0
# via pylint
pluggy==1.3.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -165,10 +162,6 @@ pylint-plugin-utils==0.8.2
# via
# pylint-celery
# pylint-django
pyparsing==3.1.1
# via
# -r requirements/test.txt
# packaging
pytest==7.4.3
# via
# -r requirements/test.txt
Expand All @@ -180,7 +173,7 @@ pytest-aiohttp==1.0.5
# via
# -r requirements/test.txt
# pytest-repo-health
pytest-asyncio==0.21.1
pytest-asyncio==0.23.2
# via
# -r requirements/test.txt
# pytest-aiohttp
Expand Down
9 changes: 2 additions & 7 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ oauthlib==3.2.2
# via
# -r requirements/base.txt
# requests-oauthlib
packaging==21.3
packaging==23.2
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# pytest
pluggy==1.3.0
Expand All @@ -107,10 +106,6 @@ pyasn1-modules==0.3.0
# via
# -r requirements/base.txt
# google-auth
pyparsing==3.1.1
# via
# -r requirements/base.txt
# packaging
pytest==7.4.3
# via
# -r requirements/base.txt
Expand All @@ -122,7 +117,7 @@ pytest-aiohttp==1.0.5
# via
# -r requirements/base.txt
# pytest-repo-health
pytest-asyncio==0.21.1
pytest-asyncio==0.23.2
# via
# -r requirements/base.txt
# pytest-aiohttp
Expand Down
2 changes: 1 addition & 1 deletion tests/data/mock_django_dependencies_sheet.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
40,edx-opaque-keys,yes,-,2.2.0,2.2.0,-,"Feb 1, 2021",,,
103,django-storages,,1.11,1.8,1.1,-,"Jun 21, 2021",https://github.com/edx/upgrades/issues/44,,
110,edx-django-utils,yes,-,master,4.2.0,4.2.0,"Jul 14, 2021",BOM-2634,,
30,djangorestframework,,3.12.3,3.11.0,3.12.0,p,"Jun 30, 2021",,,3.12.4
30,djangorestframework,,3.12.3,3.11.0,3.12.0,3.13.0,"Jun 30, 2021",,,3.12.4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p was typo.

29,django-waffle,,2.2.0,0.19.0,2.0.0,-,"May 22, 2021",,,
2 changes: 1 addition & 1 deletion tests/fake_repos/python_repo/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ django==2.2.24
# -r requirements/base.in
# djangorestframework
# edx-django-utils
djangorestframework==3.12.4
djangorestframework==3.13.0
# via -r requirements/base.in
edx-django-utils==2.0.4
# via
Expand Down
2 changes: 1 addition & 1 deletion tests/fake_repos/python_repo/requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ django==2.2.24
# edx-django-utils
# edx-i18n-tools
# edx-lint
djangorestframework==3.12.4
djangorestframework==3.13.0
# via -r requirements/quality.txt
edx-django-utils==2.0.4
# via
Expand Down
2 changes: 1 addition & 1 deletion tests/fake_repos/python_repo/requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ django==2.2.24
# djangorestframework
# edx-django-utils
# edx-lint
djangorestframework==3.12.4
djangorestframework==3.13.0
# via -r requirements/test.txt
edx-django-utils==2.0.4
# via
Expand Down
Loading