unpin pytest

toluaina · Oct 19, 2022 · fd6e4bd · fd6e4bd
1 parent 4193452
commit fd6e4bd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/requirements/dev.in b/requirements/dev.in
@@ -4,5 +4,4 @@
 coverage
 pip-tools
 pre-commit
-setuptools
-guppy3
+setuptools
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -75,8 +75,6 @@ freezegun==1.2.2
     # via -r requirements/test.in
 greenlet==1.1.3.post0
     # via sqlalchemy
-guppy3==3.1.2
-    # via -r requirements/dev.in
 identify==2.5.6
     # via pre-commit
 idna==3.4
@@ -136,7 +134,7 @@ pyflakes==2.5.0
     # via flake8
 pyparsing==3.0.9
     # via packaging
-pytest==6.2.5
+pytest==7.1.3
     # via
     #   -r requirements/test.in
     #   pytest-cov
@@ -182,14 +180,13 @@ sqlparse==0.4.3
 termcolor==2.0.1
     # via pytest-sugar
 toml==0.10.2
-    # via
-    #   pre-commit
-    #   pytest
+    # via pre-commit
 tomli==2.0.1
     # via
     #   black
     #   build
     #   coverage
+    #   pytest
 typing-extensions==4.4.0
     # via black
 urllib3==1.26.12

diff --git a/requirements/test.in b/requirements/test.in
@@ -12,7 +12,4 @@ pytest-runner
 pytest-mock
 pytest-sugar
 pytest-runner
-freezegun
-
-# pin to last know stable pytest
-pytest==6.2.5
+freezegun
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -110,7 +110,7 @@ pyflakes==2.5.0
     # via flake8
 pyparsing==3.0.9
     # via packaging
-pytest==6.2.5
+pytest==7.1.3
     # via
     #   -r requirements/test.in
     #   pytest-cov
@@ -153,12 +153,11 @@ sqlparse==0.4.3
     # via -r requirements/base.in
 termcolor==2.0.1
     # via pytest-sugar
-toml==0.10.2
-    # via pytest
 tomli==2.0.1
     # via
     #   black
     #   coverage
+    #   pytest
 typing-extensions==4.4.0
     # via black
 urllib3==1.26.12

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,7 +1,6 @@
 """Generic fixtures for PGSync tests."""
 import logging
 import os
-import warnings
 
 import pytest
 import sqlalchemy as sa
@@ -14,8 +13,6 @@
 from pgsync.sync import Sync
 from pgsync.urls import get_postgres_url
 
-warnings.filterwarnings("error")
-
 logging.getLogger("faker").setLevel(logging.ERROR)
 
 

diff --git a/tests/test_helper.py b/tests/test_helper.py
@@ -3,7 +3,7 @@
 import sqlalchemy as sa
 from mock import ANY, call, patch
 
-from pgsync.helper import teardown
+from pgsync import helper
 
 
 @pytest.mark.usefixtures("table_creator")
@@ -17,7 +17,7 @@ def test_teardown_with_drop_db(self, mock_sync, mock_config, mock_logger):
         mock_config.return_value = "tests/fixtures/schema.json"
         mock_sync.truncate_schemas.return_value = None
         with patch("pgsync.helper.drop_database") as mock_db:
-            teardown(drop_db=True, config="fixtures/schema.json")
+            helper.teardown(drop_db=True, config="fixtures/schema.json")
             assert mock_db.call_args_list == [
                 call(ANY),
                 call(ANY),
@@ -32,7 +32,7 @@ def test_teardown_without_drop_db(self, mock_config, mock_logger, mock_es):
         mock_config.return_value = "tests/fixtures/schema.json"
         with patch("pgsync.sync.Sync") as mock_sync:
             mock_sync.truncate_schemas.side_effect = sa.exc.OperationalError
-            teardown(drop_db=False, config="fixtures/schema.json")
+            helper.teardown(drop_db=False, config="fixtures/schema.json")
             assert mock_logger.warning.call_args_list == [
                 call(ANY),
                 call(ANY),