Make archive_settings and published_settings, require valid s3_bucket

Also updates required version of pytest in accordance with advice in 
pytest-dev/pytest-asyncio#115 as needed for 
pytest-asyncio to use 'get_closest_marker'.

Author: mpacer

bookstore/bookstore_config.py

@@ -76,8 +76,8 @@ def validate_bookstore(settings: BookstoreSettings):
         Existence of settings by category (general, archive, publish)
     """
     general_settings = [settings.s3_bucket != "", settings.s3_endpoint_url != ""]
-    archive_settings = [settings.workspace_prefix != ""]
-    published_settings = [settings.published_prefix != ""]
+    archive_settings = [*general_settings, settings.workspace_prefix != ""]
+    published_settings = [*general_settings, settings.published_prefix != ""]
 
     validation_checks = {
         "bookstore_valid": all(general_settings),

bookstore/tests/test_bookstore_config.py

@@ -6,34 +6,34 @@
 
 def test_validate_bookstore_defaults():
     """Tests that all bookstore validates with default values."""
-    expected = {"bookstore_valid": False, "publish_valid": True, "archive_valid": True}
+    expected = {"bookstore_valid": False, "publish_valid": False, "archive_valid": False}
     settings = BookstoreSettings()
     assert validate_bookstore(settings) == expected
 
 
 def test_validate_bookstore_published():
     """Tests that bookstore does not validate with an empty published_prefix."""
-    expected = {"bookstore_valid": False, "publish_valid": False, "archive_valid": True}
-    settings = BookstoreSettings(published_prefix="")
+    expected = {"bookstore_valid": True, "publish_valid": False, "archive_valid": True}
+    settings = BookstoreSettings(s3_bucket="A_bucket", published_prefix="")
     assert validate_bookstore(settings) == expected
 
 
 def test_validate_bookstore_workspace():
     """Tests that bookstore does not validate with an empty workspace_prefix."""
-    expected = {"bookstore_valid": False, "publish_valid": True, "archive_valid": False}
-    settings = BookstoreSettings(workspace_prefix="")
+    expected = {"bookstore_valid": True, "publish_valid": True, "archive_valid": False}
+    settings = BookstoreSettings(s3_bucket="A_bucket", workspace_prefix="")
     assert validate_bookstore(settings) == expected
 
 
 def test_validate_bookstore_endpoint():
     """Tests that bookstore does not validate with an empty s3_endpoint_url."""
-    expected = {"bookstore_valid": False, "publish_valid": True, "archive_valid": True}
+    expected = {"bookstore_valid": False, "publish_valid": False, "archive_valid": False}
     settings = BookstoreSettings(s3_endpoint_url="")
     assert validate_bookstore(settings) == expected
 
 
 def test_validate_bookstore_bucket():
-    """Tests that bookstore does not validate with an empty s3_bucket."""
+    """Tests that all bookstore features validate with an s3_bucket."""
     expected = {"bookstore_valid": True, "publish_valid": True, "archive_valid": True}
     settings = BookstoreSettings(s3_bucket="A_bucket")
     assert validate_bookstore(settings) == expected

requirements-dev.txt

@@ -4,7 +4,7 @@ flake8
 mock
 mypy==0.660  # pin to avoid surprises
 pre-commit
-pytest>=3.3
+pytest>=3.6
 pytest-asyncio
 pytest-cov
 pytest-mock