Merge pull request #34 from jayaddison/github/update-postgres

GitHub Actions: update postgres service definition

Author: jeancochrane

.github/workflows/main.yml

@@ -14,11 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.5.x, 3.6.x, 3.7.x]
+        python: [3.6.x, 3.7.x]
         sqlalchemy: [1.2.*, 1.3.*]
     services:
       postgres:
         image: postgres:11
+        env:
+          POSTGRES_PASSWORD: postgres
         ports:
         - 5432:5432
         # needed because the postgres container does not provide a healthcheck
@@ -36,5 +38,5 @@ jobs:
         pip install --upgrade sqlalchemy=="${SQLALCHEMY_VERSION}"
         pytest
       env:
-        TEST_DATABASE_URL: postgresql://postgres@localhost:5432/pytest_test
+        TEST_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/pytest_test
         SQLALCHEMY_VERSION: ${{ matrix.sqlalchemy }}

.travis.yml

@@ -6,8 +6,6 @@ branches:
 language: python
 python:
   - '3.6'
-  - '3.5'
-  - '3.4'
 
 env:
   global:

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Removed
+
+- Drop support for Python versions prior to 3.6
+
 ## [1.0.2](https://github.com/jeancochrane/pytest-flask-sqlalchemy/releases/tag/v1.0.2) (2019-04-03)
 
 ### Changed

setup.py

@@ -21,7 +21,7 @@ def readme():
                       'SQLAlchemy>=1.2.2',
                       'Flask-SQLAlchemy>=2.3',
                       'packaging>=14.1'],
-    extras_require={'tests': ['pytest-postgresql<2.0', 'psycopg2-binary']},
+    extras_require={'tests': ['pytest-postgresql>=2.4.0', 'psycopg2-binary']},
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Plugins',

tests/_conftest.py

@@ -30,13 +30,14 @@ def database(request):
     pg_host = DB_OPTS.get("host")
     pg_port = DB_OPTS.get("port")
     pg_user = DB_OPTS.get("username")
+    pg_pass = DB_OPTS.get("password")
     pg_db = DB_OPTS["database"]
 
-    init_postgresql_database(pg_user, pg_host, pg_port, pg_db)
+    init_postgresql_database(pg_user, pg_host, pg_port, pg_db, pg_pass)
 
     @request.addfinalizer
     def drop_database():
-        drop_postgresql_database(pg_user, pg_host, pg_port, pg_db, 9.6)
+        drop_postgresql_database(pg_user, pg_host, pg_port, pg_db, 9.6, pg_pass)
 
 
 @pytest.fixture(scope='session')

tests/test_configs.py

@@ -99,13 +99,14 @@ def database(request):
             pg_host = DB_OPTS.get("host")
             pg_port = DB_OPTS.get("port")
             pg_user = DB_OPTS.get("username")
+            pg_pass = DB_OPTS.get("password")
             pg_db = DB_OPTS["database"]
 
-            init_postgresql_database(pg_user, pg_host, pg_port, pg_db)
+            init_postgresql_database(pg_user, pg_host, pg_port, pg_db, pg_pass)
 
             @request.addfinalizer
             def drop_database():
-                drop_postgresql_database(pg_user, pg_host, pg_port, pg_db, 9.6)
+                drop_postgresql_database(pg_user, pg_host, pg_port, pg_db, 9.6, pg_pass)
 
 
         @pytest.fixture(scope='session')