Merge branch 'main' into feature/improve_programmatic_interface

Dockerfile-pytest-integration

@@ -9,11 +9,12 @@ RUN pip3 install --upgrade pip hatch
 COPY README.md pyproject.toml conftest.py ./
 # Copy source code
 COPY ./src/ ./src/
+COPY ./tests/ ./tests/
 
 # Setup hatch env which will install deps
 RUN hatch env create test
 
 # Take arg for database URL, specified in docker-compose.yml
 ARG DATABASE_URL
 ENV DATABASE_URL=${DATABASE_URL:-}
-ENTRYPOINT hatch --env test run pytest . -vv --database-url "$DATABASE_URL"
+ENTRYPOINT hatch --env test run pytest tests/ -vv --database-url "$DATABASE_URL"

pyproject.toml

@@ -60,7 +60,7 @@ extra-dependencies = [
 ]
 
 [tool.hatch.envs.test.scripts]
-run = "pytest ./src -vv"
+run = "pytest tests/ -vv"
 postgres-integration-test-docker-as-sudo = [
   "sudo docker compose build",
   "sudo docker compose run postgres-integration-test",

src/tiktok_api_helper/test_api_client.py → tests/test_api_client.py

@@ -23,14 +23,14 @@
     CrawlTag,
     upsert_videos,
 )
-from tiktok_api_helper.test_utils import (
+from tests.test_utils import (
     test_database_engine,
     testdata_api_response_json,
     all_videos,
     all_crawls,
 )
 
-FAKE_SECRETS_YAML_FILE = Path("src/tiktok_api_helper/testdata/fake_secrets.yaml")
+FAKE_SECRETS_YAML_FILE = Path("tests/testdata/fake_secrets.yaml")
 
 
 @pytest.fixture

src/tiktok_api_helper/test_sql.py → tests/test_sql.py

@@ -16,7 +16,7 @@
     CrawlTag,
     upsert_videos,
 )
-from tiktok_api_helper.test_utils import (
+from tests.test_utils import (
     test_database_engine,
     testdata_api_response_json,
     all_videos,

src/tiktok_api_helper/test_utils.py → tests/test_utils.py

@@ -33,7 +33,7 @@ def test_database_engine(database_url_command_line_arg) -> Engine:
 
 @pytest.fixture
 def testdata_api_response_json():
-    with open("src/tiktok_api_helper/testdata/api_response.json", "r") as f:
+    with open("tests/testdata/api_response.json", "r") as f:
         return json.load(f)