Merge from master #3620
Merged
Merge from master #3620
+1,064
−1,227
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
this prepares the splitting
This fix was suggested by Stack Overflow user phd in <https://stackoverflow.com/a/50863820/744178>.
begin to turn config into package
Fix 2 DeprecationWarnings about invalid escape seq
…_docs 3525 typo fixture docs
Fix encoding error with `print` statements in doctests
Use --show-diff-on-failure for pre-commit CI invocation
this makes the file valid and prepares for pypa/pip#5416 and pypa/pip#5512
…ompliance add build-system section to pyproject.toml
Travis and AppVeyor were executing "py35-freeze", which does not actually exist in tox.ini.
…eanup Remove unused attribute and parameter in CallSpec2
Fix reference to py36-freeze in travis and appveyor
@pytest.mark.skipif's example's description (above the code) was the opposite of the condition in the code, fixed the description to match the code.
…unctools_reduce Silence usage of `reduce` warning in python 2
Added changelog file
Used pytest.fixture.skipif instead of pytest.mark.skipif
Doc Fix: skipif's example description
From Python 3.3 is mock part of python standard library in unittest namespace
Fix `ImportWarning` triggered by explicit relative imports
Prefer unittest.mock before mock
…array If the user pass as a expected value a numpy array created like numpy.array(5); it will creates an array with one element without shape, when used with approx it will raise an error 'TypeError: iteration over a 0-d array'
For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
Update pypi.python.org URLs to pypi.org
…est-approx Bug fix pytest-dev#3593 - approx repr in a 0-d numpy array
Upgrade hooks
RonnyPfannschmidt
force-pushed
the
merge-from-master
branch
from
dbe4e3e to
89e0a3e
Compare
Member
|
@RonnyPfannschmidt did you mean the other way around? It seems you are trying to merge |
Member
Author
|
@nicoddemus indeed, thanks for the note i switched the base |
nicoddemus
approved these changes
Jun 26, 2018
Member
|
Feel free to merge this once AppVeyor passes if anybody beats me to it. 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
No description provided.