Remove test cache expiry (#34)

* Fix Tox test workflow

* Set expiry to None for test cache

* Remove Github Secret from Testing

* Rename Publishing Action

.github/workflows/publish-to-pypi.yaml → .github/workflows/publishing.yaml

@@ -1,12 +1,13 @@
-name: 'Publish to PyPI'
+name: 'Publishing'
 
 on:
   push:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  publish:
+  pypi:
+    name: 'Publish to PyPI'
     strategy:
       fail-fast: false
       matrix:

.github/workflows/tox-testing.yaml → .github/workflows/testing.yaml

@@ -1,4 +1,4 @@
-name: 'Tox Testing'
+name: 'Testing'
 
 on:
   push:
@@ -9,7 +9,8 @@ on:
       - main
 
 jobs:
-  test:
+  tox:
+    name: 'Tox Tests'
     strategy:
       fail-fast: false
       matrix:
@@ -22,7 +23,7 @@ jobs:
           - macos-latest
           - windows-latest
     env:
-      COMICVINE_API_KEY: ${{ secrets.COMICVINE_API_KEY }}
+      COMICVINE_API_KEY: 'Testing-Key'
     runs-on: ${{ matrix.os }}
     steps:
       #----------------------------------------------

README.md

@@ -7,7 +7,7 @@
 
 [![Github - Contributors](https://img.shields.io/github/contributors/Buried-In-Code/Simyan.svg?logo=Github&label=Contributors&style=flat-square)](https://github.com/Buried-In-Code/Simyan/graphs/contributors)
 [![Github Action - Code Analysis](https://img.shields.io/github/workflow/status/Buried-In-Code/Simyan/Code-Analysis?logo=Github-Actions&label=Code-Analysis&style=flat-square)](https://github.com/Buried-In-Code/Simyan/actions/workflows/code-analysis.yaml)
-[![Github Action - Tox Testing](https://img.shields.io/github/workflow/status/Buried-In-Code/Simyan/Tox-Testing?logo=Github-Actions&label=Tox-Tests&style=flat-square)](https://github.com/Buried-In-Code/Simyan/actions/workflows/tox-testing.yaml)
+[![Github Action - Testing](https://img.shields.io/github/workflow/status/Buried-In-Code/Simyan/Testing?logo=Github-Actions&label=Tests&style=flat-square)](https://github.com/Buried-In-Code/Simyan/actions/workflows/testing.yaml)
 
 [![Code Style - Black](https://img.shields.io/badge/Code%20Style-Black-000000.svg?style=flat-square)](https://github.com/psf/black)
 

Simyan/sqlite_cache.py

@@ -5,18 +5,24 @@
 
 
 class SqliteCache:
-    def __init__(self, name: str = "Simyan-Cache.sqlite", expiry: int = 14):
+    def __init__(self, name: str = "Simyan-Cache.sqlite", expiry: Optional[int] = 14):
         self.expiry = expiry
         self.con = sqlite3.connect(name)
         self.cur = self.con.cursor()
         self.cur.execute("CREATE TABLE IF NOT EXISTS queries (query, response, expiry);")
         self.delete()
 
     def select(self, query: str) -> Dict[str, Any]:
-        self.cur.execute(
-            "SELECT response FROM queries WHERE query = ? AND expiry > ?;",
-            (query, datetime.now().strftime("%Y-%m-%d")),
-        )
+        if self.expiry:
+            self.cur.execute(
+                "SELECT response FROM queries WHERE query = ? AND expiry > ?;",
+                (query, datetime.now().strftime("%Y-%m-%d")),
+            )
+        else:
+            self.cur.execute(
+                "SELECT response FROM queries WHERE query = ?;",
+                (query,),
+            )
         result = self.cur.fetchone()
         if result:
             return json.loads(result[0])
@@ -37,6 +43,8 @@ def store(self, key: str, value: str):
         return self.insert(query=key, response=value)
 
     def delete(self):
+        if not self.expiry:
+            return
         self.cur.execute(
             "DELETE FROM queries WHERE expiry < ?;",
             (datetime.now().strftime("%Y-%m-%d"),),

pyproject.toml

@@ -43,7 +43,7 @@ flake8 = "^3.9.2"
 black = "^21.8b0"
 isort = "^5.9.3"
 pre-commit = "^2.15.0"
-pyupgrade = "^2.25.0"
+pyupgrade = "^2.25.1"
 seed-isort-config = "^2.2.0"
 tox = "^3.24.3"
 
@@ -71,3 +71,6 @@ source = ["Simyan"]
 
 [tool.coverage.report]
 show_missing = true
+
+[tool.pytest.ini_options]
+addopts = ["--cov", "-x"]

tests/conftest.py

@@ -12,4 +12,4 @@ def comicvine_api_key():
 
 @pytest.fixture(scope="session")
 def comicvine(comicvine_api_key):
-    return api(api_key=comicvine_api_key, cache=sqlite_cache.SqliteCache("tests/Simyan-Cache.sqlite"))
+    return api(api_key=comicvine_api_key, cache=sqlite_cache.SqliteCache("tests/Simyan-Cache.sqlite", expiry=None))

tox.ini

@@ -5,7 +5,9 @@ envlist = py37, py38, py39
 [testenv]
 setenv =
 	COMICVINE_API_KEY={env:COMICVINE_API_KEY}
-deps = pytest
+deps =
+	pytest
+	pytest-cov
 commands =
 	python --version
-    pytest tests/
+    pytest