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

Sync fork master branch #1

Merged
merged 32 commits into from
Mar 17, 2023
Merged

Sync fork master branch #1

merged 32 commits into from
Mar 17, 2023

Conversation

benf710
Copy link
Owner

@benf710 benf710 commented Mar 17, 2023

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have run the pre-commit run command to format and lint.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have added my name and/or github handle to AUTHORS.rst
  • I have added my change to CHANGES.rst
  • All new and existing tests passed.

dependabot bot and others added 30 commits December 23, 2022 17:01
@dependabot
Bump tox-gh-actions from 2.11.0 to 3.0.0 in /requirements
3e95ea7 
Bumps [tox-gh-actions](https://github.com/ymyzk/tox-gh-actions) from 2.11.0 to 3.0.0.
- [Release notes](https://github.com/ymyzk/tox-gh-actions/releases)
- [Commits](ymyzk/tox-gh-actions@v2.11.0...v3.0.0)

---
updated-dependencies:
- dependency-name: tox-gh-actions
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@nick-traeger
Base manager can now be used for clean_duplicate_history
44f687e
@dependabot
Bump black from 22.10.0 to 23.1.0 in /requirements (#1121)
ad484d9 
Bumps [black](https://github.com/psf/black) from 22.10.0 to 23.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@22.10.0...23.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump isort from 5.10.1 to 5.12.0 in /requirements (#1118)
cef0808 
Bumps [isort](https://github.com/pycqa/isort) from 5.10.1 to 5.12.0.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](PyCQA/isort@5.10.1...5.12.0)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump coverage from 6.5.0 to 7.1.0 in /requirements (#1114)
a836b88 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.5.0 to 7.1.0.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@6.5.0...7.1.0)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @ddabble
Bump tox from 3.27.1 to 4.4.4 in /requirements
0a84855 
Bumps [tox](https://github.com/tox-dev/tox) from 3.27.1 to 4.4.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@3.27.1...4.4.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@ddabble
Merge pull request #1086 from jazzband/dependabot/pip/requirements/to…
c6bd5c1 
…x-gh-actions-3.0.0

Bump tox-gh-actions from 2.11.0 to 3.0.0 in /requirements
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (#1066)
697163d 
updates:
- [github.com/psf/black: 22.10.0 → 22.12.0](psf/black@22.10.0...22.12.0)
- [github.com/PyCQA/isort: 5.10.1 → 5.12.0](PyCQA/isort@5.10.1...5.12.0)
- [github.com/adrienverge/yamllint: v1.28.0 → v1.29.0](adrienverge/yamllint@v1.28.0...v1.29.0)
- [github.com/asottile/pyupgrade: v3.2.2 → v3.3.1](asottile/pyupgrade@v3.2.2...v3.3.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate
2a28f2c 
updates:
- [github.com/psf/black: 22.12.0 → 23.1.0](psf/black@22.12.0...23.1.0)
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
add4f15 
for more information, see https://pre-commit.ci
@ddabble
Merge pull request #1123 from jazzband/pre-commit-ci-update-config
eca46b1 
[pre-commit.ci] pre-commit autoupdate
@ddabble
Set USE_TZ explicitly to fix some failing tests
0fcc722 
In Django's `main` branch, the default value of the `USE_TZ` setting was changed from `False` to `True`
(see django/django@602d9a3),
which caused the tests relying on timezone-naive `datetime` objects, to fail.

Example of some of the failing tests:
https://github.com/jazzband/django-simple-history/actions/runs/4108104757/jobs/7088397467.
@ddabble
Exclude testing py38+py39 with djmain
c971c14 
...to fix the remaining failing tests.
This is due to Django's `main` branch now requiring Python >=3.10.

Example of the errors:
https://github.com/jazzband/django-simple-history/actions/runs/4108104757/jobs/7088396098.
@ddabble
Corrected the test workflow badge URLs
891174e 
These URLs were not updated when the `build` workflow was renamed to `test`
(in 60beaf4).
@ddabble
Merge pull request #1115 from ideler/master
636bcbc 
Base manager can now be used for clean_duplicate_history
@dependabot
Bump tox from 4.4.4 to 4.4.5 in /requirements
a95193a 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.4 to 4.4.5.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.4.4...4.4.5)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
fdee87c 
for more information, see https://pre-commit.ci
@ddabble
Merge pull request #1125 from jazzband/dependabot/pip/requirements/to…
79182d6 
…x-4.4.5

Bump tox from 4.4.4 to 4.4.5 in /requirements
@ddabble
Merge pull request #1124 from ddabble/fix/failing-tests
018099c 
Fix failing tests
@dependabot
Bump tox from 4.4.5 to 4.4.6 in /requirements
196ec68 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.5 to 4.4.6.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.4.5...4.4.6)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@ddabble
Ensured lines don't exceed max length of 88
ce84402 
...to satisfy the Flake8 linter to allow the tests in #1130 to run.
@ddabble
Merge pull request #1130 from jazzband/dependabot/pip/requirements/to…
eeea6bf 
…x-4.4.6

Bump tox from 4.4.5 to 4.4.6 in /requirements
@dependabot
Bump coverage from 7.1.0 to 7.2.0 in /requirements (#1134)
0c7abf8 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.1.0...7.2.0)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump coverage from 7.2.0 to 7.2.1 in /requirements (#1136)
9e64b31 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.2.0...7.2.1)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ddabble
Prepared for release 3.3.0
a83fb5f 
Added some missing entries to `CHANGES.rst` and moved some entries that were erroneously added to the 3.2.0 section, to 3.3.0 instead.
@ddabble
Merge pull request #1139 from jazzband/prepare-3.3.0
6a849ce 
Prepare for release 3.3.0
@ddabble
Fixed tests in AdminSiteTest on Django main branch
e8cc2b2 
Example of failing tests: https://github.com/jazzband/django-simple-history/actions/runs/4368637153/jobs/7641472149

The commit django/django@473283d
added a `log_entries` key to the dict returned by `AdminSite.each_context()`, with a value of type `QuerySet`.
The cause of the failing tests seems to be that `QuerySet` hasn't implemented an `__eq__()` method (see
https://github.com/django/django/blob/32d4b61c313be5169137047e9fb3668da20a5d89/django/db/models/query.py#L290),
and since the tests create a new `QuerySet` instance (when calling the `each_context()` method) to compare to
the arguments passed to `mock_render`, the instances won't be equal, since they're not the same object.
@ddabble
Merge pull request #1140 from ddabble/fix/admin-tests-on-djmain
17ad67c 
Fix failing admin tests when testing against Django's main branch
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (#1145)
75daadf 
updates:
- [github.com/PyCQA/bandit: 1.7.4 → 1.7.5](PyCQA/bandit@1.7.4...1.7.5)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@dependabot
Bump tox from 4.4.6 to 4.4.7 in /requirements (#1143)
5ab312d 
Bumps [tox](https://github.com/tox-dev/tox) from 4.4.6 to 4.4.7.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@4.4.6...4.4.7)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot added 2 commits March 14, 2023 01:50
@dependabot
Bump tox-gh-actions from 3.0.0 to 3.1.0 in /requirements (#1144)
3d0bf0c 
Bumps [tox-gh-actions](https://github.com/ymyzk/tox-gh-actions) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/ymyzk/tox-gh-actions/releases)
- [Commits](ymyzk/tox-gh-actions@v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: tox-gh-actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump coverage from 7.2.1 to 7.2.2 in /requirements (#1148)
321b783 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.2.1 to 7.2.2.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@7.2.1...7.2.2)

---
updated-dependencies:
- dependency-name: coverage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@benf710 benf710 merged commit 1a11e94 into benf710:master Mar 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@benf710 @nick-traeger @ddabble