Merge pull request #17 from Nebucatnetzer/flake-parts

Replace devenv with flake-parts and service-flakes

Author: Nebucatnetzer

.envrc

@@ -1,6 +1,6 @@
 watch_file poetry.lock
 
-if ! use flake . --no-pure-eval; then
+if ! use flake; then
     echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
 fi
 

.github/workflows/build_containers.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
-      - uses: cachix/install-nix-action@v26
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: wimpysworld/nothing-but-nix@main
+      - uses: cachix/install-nix-action@v31.3.0
       - name: Build snapbin image
         run: nix build .#snapbin-image && docker load < ./result
 

.github/workflows/tests.yml

@@ -11,25 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
-      - uses: cachix/install-nix-action@v26
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: wimpysworld/nothing-but-nix@main
+      - uses: cachix/install-nix-action@v31.3.0
       - name: Tests
-        run: nix develop --impure --command pytest --cov=snapbin tests.py
+        run: nix develop --command pytest --cov=snapbin tests.py
 
   pylint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
-      - uses: cachix/install-nix-action@v26
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: wimpysworld/nothing-but-nix@main
+      - uses: cachix/install-nix-action@v31.3.0
       - name: Tests
-        run: nix develop --impure --command pylint snapbin
+        run: nix develop --command pylint snapbin
 
   mypy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
-      - uses: cachix/install-nix-action@v26
-      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: wimpysworld/nothing-but-nix@main
+      - uses: cachix/install-nix-action@v31.3.0
       - name: Tests
-        run: nix develop --impure --command mypy .
+        run: nix develop --command mypy .

conftest.py

@@ -1,23 +1,29 @@
 import os
+from typing import Generator
+
 import pytest
+from flask.testing import FlaskClient
+from peewee import SqliteDatabase
+from py.path import local  # type: ignore
 
 os.environ["SNAPBIN_TESTING"] = "true"
 # pylint: disable=wrong-import-position
+from snapbin import database
 from snapbin import main
 from snapbin.models.secret import Secret
 
 
 @pytest.fixture(scope="function")
-def memory_db():
-    main.db.init(":memory:")
-    main.db.connect()
-    main.db.create_tables([Secret])
-    yield main.db
-    main.db.close()
+def memory_db() -> Generator[SqliteDatabase, None, None]:
+    database.db.init(":memory:")
+    database.db.connect()
+    database.db.create_tables([Secret])
+    yield database.db
+    database.db.close()
 
 
 @pytest.fixture()
-def app(tmpdir):
+def app(tmpdir: local) -> FlaskClient:
     temp_directory = tmpdir.mkdir("db")
     main.initialize_db(db_path=f"{temp_directory}/test.db")
     main.app.config["TESTING"] = True