mirror of
				https://github.com/psycopg/psycopg2.git
				synced 2025-11-04 09:47:30 +03:00 
			
		
		
		
	Merge branch 'master' into rm-3.4
This commit is contained in:
		
						commit
						d8aa60221d
					
				| 
						 | 
				
			
			@ -132,8 +132,8 @@ The current `!psycopg2` implementation supports:
 | 
			
		|||
    NOTE: keep consistent with setup.py and the /features/ page.
 | 
			
		||||
 | 
			
		||||
- Python version 2.7
 | 
			
		||||
- Python 3 versions from 3.5 to 3.9
 | 
			
		||||
- PostgreSQL server versions from 7.4 to 12
 | 
			
		||||
- Python 3 versions from 3.5 to 3.8
 | 
			
		||||
- PostgreSQL server versions from 7.4 to 13
 | 
			
		||||
- PostgreSQL client library version from 9.1
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -125,6 +125,7 @@ if (( "$TEST_PRESENT" )); then
 | 
			
		|||
    # Postgres versions supported by ARM64
 | 
			
		||||
        create 10
 | 
			
		||||
    else
 | 
			
		||||
        create 13
 | 
			
		||||
        create 12
 | 
			
		||||
        create 11
 | 
			
		||||
        create 10
 | 
			
		||||
| 
						 | 
				
			
			@ -150,5 +151,6 @@ fi
 | 
			
		|||
 | 
			
		||||
# Postgres built from master
 | 
			
		||||
if (( "$TEST_FUTURE" )); then
 | 
			
		||||
    create 13 13-master
 | 
			
		||||
    # create 14 14-master
 | 
			
		||||
    true
 | 
			
		||||
fi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -56,6 +56,7 @@ if (( "$TEST_PRESENT" )); then
 | 
			
		|||
        run_test 10
 | 
			
		||||
    else
 | 
			
		||||
    # Postgres versions supported by Travis CI
 | 
			
		||||
        run_test 13
 | 
			
		||||
        run_test 12
 | 
			
		||||
        run_test 11
 | 
			
		||||
        run_test 10
 | 
			
		||||
| 
						 | 
				
			
			@ -81,5 +82,6 @@ fi
 | 
			
		|||
 | 
			
		||||
# Postgres built from master
 | 
			
		||||
if (( "$TEST_FUTURE" )); then
 | 
			
		||||
    run_test 13
 | 
			
		||||
    # create 14 14-master
 | 
			
		||||
    true
 | 
			
		||||
fi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user