f61d0525a5 
								
							 
						 
						
							
							
								
								Merge pull request  #3318  from nicoddemus/merge-master-into-features  
							
							... 
							
							
							
							Merge master into features 
							
						 
						
							2018-03-17 09:40:32 +01:00  
				
					
						
							
							
								 
						
							
								1fff81e21d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2018-03-16 18:15:28 -03:00  
				
					
						
							
							
								 
						
							
								a754f00ae7 
								
							 
						 
						
							
							
								
								Improve `numpy.approx` array-scalar comparisons  
							
							... 
							
							
							
							So that `self.expected` in ApproxNumpy is always a numpy array. 
							
						 
						
							2018-03-16 09:01:18 -03:00  
				
					
						
							
							
								 
						
							
								42c84f4f30 
								
							 
						 
						
							
							
								
								Add fixes to `numpy.approx` array-scalar comparisons (from PR suggestions)  
							
							
							
						 
						
							2018-03-15 13:41:58 -03:00  
				
					
						
							
							
								 
						
							
								97f9a8bfdf 
								
							 
						 
						
							
							
								
								Add fixes to make `numpy.approx` array-scalar comparisons work with older numpy versions  
							
							
							
						 
						
							2018-03-14 17:10:35 -03:00  
				
					
						
							
							
								 
						
							
								161d4e5fe4 
								
							 
						 
						
							
							
								
								Add support for pytest.approx comparisons between scalar and array (inverted order)  
							
							
							
						 
						
							2018-03-14 16:29:04 -03:00  
				
					
						
							
							
								 
						
							
								c34dde7a3f 
								
							 
						 
						
							
							
								
								Add support for pytest.approx comparisons between array and scalar  
							
							
							
						 
						
							2018-03-14 15:47:21 -03:00  
				
					
						
							
							
								 
						
							
								215c6b281e 
								
							 
						 
						
							
							
								
								Add Monkeypatch and tutorial links for logging  
							
							
							
						 
						
							2018-03-06 20:41:20 -03:00  
				
					
						
							
							
								 
						
							
								25399da904 
								
							 
						 
						
							
							
								
								Reintroduce more_itertools dependency  
							
							... 
							
							
							
							Reintroduce more_itertools that was added in #3265 , now in the features branch 
							
						 
						
							2018-03-04 10:59:46 -03:00  
				
					
						
							
							
								 
						
							
								65534682aa 
								
							 
						 
						
							
							
								
								Revert introduction of more_itertools  
							
							... 
							
							
							
							This was merged on master but really should be on features: we should not
add new dependencies in bug-fix releases
This reverts commits:
* cfaf3600c114a9b1ec83 
							
						 
						
							2018-03-04 10:56:24 -03:00  
				
					
						
							
							
								 
						
							
								cfaf3600c1 
								
							 
						 
						
							
							
								
								Consolidate behavior by using filterfalse and always_iterable  
							
							
							
						 
						
							2018-02-27 03:38:56 -05:00  
				
					
						
							
							
								 
						
							
								6e14585ca2 
								
							 
						 
						
							
							
								
								Fix approx default tolerances for Decimal  
							
							
							
						 
						
							2018-02-21 23:08:23 +01:00  
				
					
						
							
							
								 
						
							
								3cbf0c8ec0 
								
							 
						 
						
							
							
								
								Raise unexpected exceptions with pytest.raises() using match=  
							
							
							
						 
						
							2018-02-15 12:11:56 +01:00  
				
					
						
							
							
								 
						
							
								9849022eb2 
								
							 
						 
						
							
							
								
								Remove "matching '...'" part from the pytest.raises message  
							
							... 
							
							
							
							When a test with pytest.raises(ValueError, match='foo') doesn't raise, the
following error is printed:
    Failed: DID NOT RAISE <class 'ValueError'> matching 'foo'
This error message is confusing as it implies a ValueError was raised, but the
message wasn't matching 'foo'.
I first considered rewording it somehow to preserve the match pattern in it, but
I don't think that's worthwhile as the pattern should usually be apparent from
the stacktrace anyways (hard-coded, as parametrization, or with --showlocals for
more sophisticated cases). 
							
						 
						
							2018-02-14 19:20:00 +01:00  
				
					
						
							
							
								 
						
							
								e5b527d0e3 
								
							 
						 
						
							
							
								
								Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`  
							
							
							
						 
						
							2018-02-09 16:28:17 -08:00  
				
					
						
							
							
								 
						
							
								983a09a2d4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-11-10 18:33:02 -02:00  
				
					
						
							
							
								 
						
							
								b11640c1eb 
								
							 
						 
						
							
							
								
								Fix linting E722: do not use bare except  
							
							
							
						 
						
							2017-11-04 13:59:10 -02:00  
				
					
						
							
							
								 
						
							
								4e581b637f 
								
							 
						 
						
							
							
								
								Use zip and map from six  
							
							
							
						 
						
							2017-10-24 22:13:32 -02:00  
				
					
						
							
							
								 
						
							
								6821d36ca5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into merge-master-into-features  
							
							
							
						 
						
							2017-10-24 19:57:14 -02:00  
				
					
						
							
							
								 
						
							
								a3ec3df0c8 
								
							 
						 
						
							
							
								
								Add E722 and E741 flake errors to the ignore list  
							
							... 
							
							
							
							Also fixed 'E704 multiple statements on one line (def)' in python_api 
							
						 
						
							2017-10-23 18:19:15 -02:00  
				
					
						
							
							
								 
						
							
								ef732fc51d 
								
							 
						 
						
							
							
								
								Remove code for unsupported Python versions  
							
							
							
						 
						
							2017-10-10 08:54:56 +03:00  
				
					
						
							
							
								 
						
							
								f18780ed8a 
								
							 
						 
						
							
							
								
								Update docs: ``match`` keyword was introduced in 3.1  
							
							... 
							
							
							
							Also update the text to recommend using the context-manager
over the callable/string forms. 
							
						 
						
							2017-08-16 14:28:34 -03:00  
				
					
						
							
							
								 
						
							
								763c580a2a 
								
							 
						 
						
							
							
								
								Merge pull request  #2576  from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx  
							
							... 
							
							
							
							#2003  Change behavior of `approx.py` to only support `__eq__` comparison 
						
							2017-07-30 17:48:33 -03:00  
				
					
						
							
							
								 
						
							
								06a49338b2 
								
							 
						 
						
							
							
								
								make Test Outcomes inherit from BaseException instead of exception  
							
							... 
							
							
							
							fixes  #580  
						
							2017-07-28 15:28:51 +02:00  
				
					
						
							
							
								 
						
							
								80f4699572 
								
							 
						 
						
							
							
								
								approx raises TypeError in Python 2 for comparison operators other than != and ==  
							
							
							
						 
						
							2017-07-25 20:07:10 -03:00  
				
					
						
							
							
								 
						
							
								57a232fc5a 
								
							 
						 
						
							
							
								
								Remove out of scope change  
							
							
							
						 
						
							2017-07-25 19:19:14 -03:00  
				
					
						
							
							
								 
						
							
								f0936d42fb 
								
							 
						 
						
							
							
								
								Fix linter errors  
							
							
							
						 
						
							2017-07-25 19:17:58 -03:00  
				
					
						
							
							
								 
						
							
								d3ab1b9df4 
								
							 
						 
						
							
							
								
								Add user documentation  
							
							... 
							
							
							
							The new doc section explains why we raise a `NotImplementedError`. 
							
						 
						
							2017-07-25 19:17:58 -03:00  
				
					
						
							
							
								 
						
							
								ebc7346be4 
								
							 
						 
						
							
							
								
								Raise TypeError for types that can't be compared to arrays.  
							
							
							
						 
						
							2017-07-22 09:05:12 -07:00  
				
					
						
							
							
								 
						
							
								495f731760 
								
							 
						 
						
							
							
								
								Simplify how comparisons with numpy arrays work.  
							
							... 
							
							
							
							Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class.  This is much simpler, and
it turns out the be a little more robust, too. 
							
						 
						
							2017-07-22 07:52:03 -07:00  
				
					
						
							
							
								 
						
							
								7b1870a94e 
								
							 
						 
						
							
							
								
								Fix flake8 in features branch  
							
							
							
						 
						
							2017-07-17 21:16:14 -03:00  
				
					
						
							
							
								 
						
							
								7a1a439049 
								
							 
						 
						
							
							
								
								Use `cls` instead of `ApproxNumpyBase`.  
							
							... 
							
							
							
							Slightly more general, probably doesn't make a difference. 
							
						 
						
							2017-07-04 09:20:52 -07:00  
				
					
						
							
							
								 
						
							
								c111e9dac3 
								
							 
						 
						
							
							
								
								Avoid making multiple ApproxNumpy types.  
							
							
							
						 
						
							2017-07-03 22:45:24 -07:00  
				
					
						
							
							
								 
						
							
								8524a57075 
								
							 
						 
						
							
							
								
								Add "approx" to all the repr-strings.  
							
							
							
						 
						
							2017-07-03 22:44:37 -07:00  
				
					
						
							
							
								 
						
							
								9597e674d9 
								
							 
						 
						
							
							
								
								Use sets to compare dictionary keys.  
							
							
							
						 
						
							2017-06-16 08:25:13 -07:00  
				
					
						
							
							
								 
						
							
								4d02863b16 
								
							 
						 
						
							
							
								
								Remove a dict-comprehension.  
							
							... 
							
							
							
							Not compatible with python26. 
							
						 
						
							2017-06-15 18:56:09 -07:00  
				
					
						
							
							
								 
						
							
								50769557e8 
								
							 
						 
						
							
							
								
								Skip the numpy doctests.  
							
							... 
							
							
							
							They seem like more trouble that they're worth. 
							
						 
						
							2017-06-15 14:53:27 -07:00  
				
					
						
							
							
								 
						
							
								8badb47db6 
								
							 
						 
						
							
							
								
								Implement suggestions from code review.  
							
							... 
							
							
							
							- Avoid importing numpy unless necessary.
- Mention numpy arrays and dictionaries in the docs.
- Add numpy to the list of tox dependencies.
- Don't unnecessarily copy arrays or allocate empty space for them.
- Use code from compat.py rather than writing py2/3 versions of things
  myself.
- Avoid reimplementing __repr__ for built-in types.
- Add an option to consider NaN == NaN, because sometimes people use NaN
  to mean "missing data". 
							
						 
						
							2017-06-15 09:19:10 -07:00  
				
					
						
							
							
								 
						
							
								8c22aee256 
								
							 
						 
						
							
							
								
								Resolve merge conflict due to approx being moved.  
							
							
							
						 
						
							2017-06-11 19:46:59 -07:00  
				
					
						
							
							
								 
						
							
								6be57a3711 
								
							 
						 
						
							
							
								
								move python api helpers out of the python module  
							
							... 
							
							
							
							this separates exposed normal api from collection elements 
							
						 
						
							2017-06-11 12:27:16 +02:00