Fix missed reference to Python 3.8

flake.lock

@@ -38,16 +38,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685566663,
+        "lastModified": 1717179513,
-        "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=",
+        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4ecab3273592f27479a583fb6d975d4aba3486fe",
+        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "23.05",
+        "ref": "24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "A personal feed aggregator";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/24.05";
     # Included to support default.nix and shell.nix
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -31,7 +31,7 @@
     devShells.${system} = {
       default = let
         pkgs = nixpkgs.legacyPackages.${system};
-        pythonEnv = pkgs.python38.withPackages (pypkgs: with pypkgs; [ flask black pytest ]);
+        pythonEnv = pkgs.python3.withPackages (pypkgs: with pypkgs; [ flask black pytest ]);
       in pkgs.mkShell {
         packages = [
           pythonEnv
@@ -46,11 +46,11 @@
     };
 
     overlays.default = final: prev: {
-      intake = final.python38Packages.buildPythonPackage {
+      intake = final.python3Packages.buildPythonPackage {
         name = "intake";
         src = builtins.path { path = ./.; name = "intake"; };
         format = "pyproject";
-        propagatedBuildInputs = with final.python38Packages; [ flask setuptools ];
+        propagatedBuildInputs = with final.python3Packages; [ flask setuptools ];
       };
     };
 

intake/app.py

@@ -253,7 +253,7 @@ def action(source_name, item_id, action):
     data_path: Path = current_app.config["INTAKE_DATA"]
     source = LocalSource(data_path, source_name)
     item = execute_action(source, item_id, action)
-    return jsonify(item)
+    return jsonify(item._item)
 
 
 @app.route("/edit/source/<string:name>", methods=["GET", "POST"])

intake/cli.py

@@ -172,7 +172,7 @@ def cmd_action(cmd_args):
     source = LocalSource(data_path, args.source)
     try:
         item = execute_action(source, args.item, args.action, 5)
-        print("Item:", item, file=sys.stderr)
+        print("Item:", item._item, file=sys.stderr)
     except InvalidConfigException as ex:
         print("Could not fetch", args.source, file=sys.stderr)
         print(ex, file=sys.stderr)

intake/templates/edit.jinja2

@@ -35,6 +35,7 @@ article {
 }
 article img {
 	max-width: 100%;
+	height: auto;
 }
 article textarea {
 	width: 100%;

intake/templates/feed.jinja2

@@ -35,6 +35,7 @@ article {
 }
 article img {
 	max-width: 100%;
+	height: auto;
 }
 button, summary {
 	cursor: pointer;

intake/templates/home.jinja2

@@ -19,6 +19,7 @@ article {
 }
 article img {
 	max-width: 100%;
+	height: auto;
 }
 button, summary {
 	cursor: pointer;
@@ -53,7 +54,7 @@ summary:focus {
 </article>
 
 <article>
-<details open>
+<details>
 <summary><span class="item-title">Sources</span></summary>
 {% if not sources %}
 <p>No sources found.</p>

module.nix

@@ -57,7 +57,7 @@ in {
   let
     # Define the intake package and a python environment to run it from
     intake = intakeCfg.package;
-    pythonEnv = pkgs.python38.withPackages (pypkgs: [ intake ]);
+    pythonEnv = pkgs.python3.withPackages (pypkgs: [ intake ]);
 
     # Assign each user an internal port for their personal intake instance
     enabledUsers = filterAttrs (userName: userCfg: userCfg.enable) intakeCfg.users;

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "intake"
-version = "1.0.4"
+version = "1.1.0"
 
 [project.scripts]
 intake = "intake.cli:main"