Skip to content

Commit

Permalink
Update reqs to support Django 4 and remove Django 2.2 (#129)
Browse files Browse the repository at this point in the history
Updates requirements to allow for Django 4 support, remove support for (the pretty ancient now) Django 2.2, and updates the changelog check logic to allow for global requirements bumps.
  • Loading branch information
jkachel authored Dec 19, 2023
1 parent 15b6d61 commit 0a678e6
Show file tree
Hide file tree
Showing 16 changed files with 2,209 additions and 1,388 deletions.
15 changes: 15 additions & 0 deletions build-support/bin/mitol/build_support/commands/changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,21 @@ def _is_excluded(path):
)
has_changelogd_changes = len(changelogd_changes) > 0

# If there's changes to the base requirements.txt, then we need to allow for
# changelogs to exist without the app code changing. There won't necessarily be
# changes in the individual apps if we're just updating project-wide dependencies.
# So, if there's no source changes, check if there's been changes to the
# requirements, and treat that as source changes.

if not has_source_changes:
reqs_paths = [
"build-support/requirements/requirements-testing.txt",
"build-support/requirements/requirements.txt",
]

reqs_changes = base_commit.diff(target_commit, paths=reqs_paths)
has_source_changes = len(reqs_changes) > 0

if has_source_changes and not has_changelogd_changes:
echo(f"Changelog(s) are missing in {app_rel_path} for these changes:")
for change in source_changes:
Expand Down
3,064 changes: 1,682 additions & 1,382 deletions build-support/lockfiles/python-default.lockfile

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions build-support/requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ django-anymail>=6.0
django-oauth-toolkit>=1.3.3
django-redis~=5.0.0
django-webpack-loader>=0.7.0
django>=2.2.12,<4.0
django>=3.0
djangorestframework>=3.0.0
djoser==2.1.0
djoser==2.2.2
edx-opaque-keys==2.2.2
google-api-python-client==1.7.11
google-auth==1.6.3
Expand All @@ -24,7 +24,7 @@ python3-saml>=1.10.1
pytz>=2020.4
requests>=2.20.0
setuptools
social-auth-app-django>=3.1.0
social-auth-core>=3.3.3
social-auth-app-django>=5.4.0
social-auth-core>=4.5.1
toolz>=0.10.0
urllib3>=1.26.5
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!--
A new scriv changelog fragment.
Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Removed
- A bullet item for the Removed category.
-->
<!--
### Added
- A bullet item for the Added category.
-->

### Changed

- Updated requirements and lockfiles to support Django 4.
- Removed support for Django 2.2.

<!--
### Deprecated
- A bullet item for the Deprecated category.
-->
<!--
### Fixed
- A bullet item for the Fixed category.
-->
<!--
### Security
- A bullet item for the Security category.
-->
Loading

0 comments on commit 0a678e6

Please sign in to comment.