Merge 0.6.x into 0.7.x #206
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: ozer550 <[email protected]>
…bump Co-authored-by: ozer550 <[email protected]>
…-params Adds cleanupsyncs command parameters
…-params corrects version number on changelogs
….6.x Update publish workflow to allow continued 0.6.x releases
Fix GH action workflows for py2.7 deprecation
Update ReadTheDocs builds configuration
Add custom user agent
…on-resume Add optional setting to ignore an existing process on resuming a sync
…l_tracking_in_deserialization No deleted model tracking in deserialization
…o older than cutoff
Don't close sync session unless also older than cutoff
# Conflicts: # .github/workflows/python-publish.yml # .github/workflows/tox.yml # morango/__init__.py # tests/testapp/tests/compat.py # tox.ini
bjester
approved these changes
Dec 12, 2023
| from test.support import EnvironmentVarGuard # noqa F401 | ||
| except ImportError: | ||
| # In Python 3.10, this has been moved to test.support.os_helper | ||
| from test.support.os_helper import EnvironmentVarGuard # noqa F401 |
There was a problem hiding this comment.
oh gosh I just remembered this nightmare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Merges up to bring latest changes to 0.7 and allow a new version to be released
TODO
Reviewer guidance
If you PR has a significant size, give the reviewer some helpful remarks
Issues addressed
List the issues solved or partly solved by the PR
Documentation
If the PR has documentation, link the file here (either .rst in your repo or if built on Read The Docs)