Merge master into features #5374
Merged
Conversation
This file contains hidden or 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
Release 4.6.0
Docs: Fix link anchor
Fix `pytest.mark.parametrize` when the argvalue is an iterator
Fix all() unroll for non-generators/non-list comprehensions
* Update setup.py requires and classifiers * Drop Python 2.7 and 3.4 from CI * Update docs dropping 2.7 and 3.4 support * Fix mock imports and remove tests related to pypi's mock module * Add py27 and 34 support docs to the sidebar * Remove usage of six from tmpdir * Remove six.PY* code blocks * Remove sys.version_info related code * Cleanup compat * Remove obsolete safe_str * Remove obsolete __unicode__ methods * Remove compat.PY35 and compat.PY36: not really needed anymore * Remove unused UNICODE_TYPES * Remove Jython specific code * Remove some Python 2 references from docs Related to #5275
Preparing release version 4.6.1
Revert "ci: Travis: add pypy3 to allowed failures temporarily"
Update release instructions for 4.6-maintenance
Drop py27 and py34 support
Merge pull request #5362 from asottile/release-4.6.1
Fix typo about interpreters count in doc/en/example/parametrize.html
logging: Extend LEVELNAME_FMT_REGEX
Automated / semi-automated python3 upgrades
nicoddemus
approved these changes
Jun 3, 2019
|
|
|
@nicoddemus oh, it hadn't run the features branch yet -- github was showing the test run for master there 😆 (ah well, we'll see after it merges I guess!) |
|
Ouch, my bad! |
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.
Mostly to get the python3-only aspects