don't try assertion rewriting on jython for now
This commit is contained in:
		
							parent
							
								
									eaec527a60
								
							
						
					
					
						commit
						fb6fc673b8
					
				|  | @ -6,6 +6,7 @@ Changes between 2.1.1 and [NEXT VERSION] | |||
| - fix issue69 / assertion rewriting fixed on some boolean operations | ||||
| - fix issue68 / packages now work with assertion rewriting | ||||
| - fix issue66: use different assertion rewriting caches when the -O option is passed | ||||
| - don't try assertion rewriting on Jython, use reinterp | ||||
| 
 | ||||
| Changes between 2.1.0 and 2.1.1 | ||||
| ---------------------------------------------- | ||||
|  |  | |||
|  | @ -1,2 +1,2 @@ | |||
| # | ||||
| __version__ = '2.1.2.dev1' | ||||
| __version__ = '2.1.2.dev2' | ||||
|  |  | |||
|  | @ -38,6 +38,9 @@ def pytest_configure(config): | |||
|             import ast | ||||
|         except ImportError: | ||||
|             mode = "reinterp" | ||||
|         else: | ||||
|             if sys.platform.startswith('java'): | ||||
|                 mode = "reinterp" | ||||
|     if mode != "plain": | ||||
|         _load_modules(mode) | ||||
|         def callbinrepr(op, left, right): | ||||
|  |  | |||
							
								
								
									
										2
									
								
								setup.py
								
								
								
								
							
							
						
						
									
										2
									
								
								setup.py
								
								
								
								
							|  | @ -24,7 +24,7 @@ def main(): | |||
|         name='pytest', | ||||
|         description='py.test: simple powerful testing with Python', | ||||
|         long_description = long_description, | ||||
|         version='2.1.2.dev1', | ||||
|         version='2.1.2.dev2', | ||||
|         url='http://pytest.org', | ||||
|         license='MIT license', | ||||
|         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue