Selaa lähdekoodia

Update requirements

Arkadiusz Ryś 2 vuotta sitten
vanhempi
commit
3c5a8f43bf
5 muutettua tiedostoa jossa 104 lisäystä ja 51 poistoa
  1. 1 1
      .editorconfig
  2. 0 22
      default.nix
  3. 75 0
      flake.nix
  4. 14 14
      pyproject.toml
  5. 14 14
      requirements.txt

+ 1 - 1
.editorconfig

@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{css,html,yml,yaml,js,xml}]
+[*.{css,html,yml,yaml,js,xml,nix}]
 indent_size = 2
 
 [{*.log,LICENSE}]

+ 0 - 22
default.nix

@@ -1,22 +0,0 @@
-{
-  pkgs ? import <nixpkgs> {}
-}:
-
-pkgs.python3Packages.buildPythonPackage rec {
-  pname = "spendpoint";
-  version = "0.2.0";
-  format = "pyproject";
-  src = ./.;
-
-  nativeBuildInputs = [
-    #flit-core
-  ];
-
-  buildInputs = [
-    #flit-core
-  ];
-
-  propagatedBuildInputs = [
-    pkgs.python3Packages.jinja2
-  ];
-}

+ 75 - 0
flake.nix

@@ -0,0 +1,75 @@
+{
+  description = "A flake for building spendpoint";
+  inputs = {
+    nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
+    flake-utils.url = github:numtide/flake-utils;
+  };
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        arklog = pkgs.python3Packages.buildPythonPackage rec {
+          pname = "arklog";
+          version = "0.5.1";
+          format = "pyproject";
+          src = pkgs.python3Packages.fetchPypi {
+            inherit pname version;
+            sha256 = "334059a336e400cafbc9a1c382e747bee2c7660115c2d0612aa725beb845acd4";
+          };
+          propagatedBuildInputs = with pkgs.python3Packages; [
+            setuptools
+            flit-core
+            toml
+            pyaml
+          ];
+          doCheck = false;
+          meta = {
+            homepage = "https://git.rys.one/arrys/arklog";
+            description = "Custom python logging formatter with color output.";
+          };
+        };
+      in rec {
+        packages = rec {
+          spendpoint = pkgs.python3Packages.buildPythonPackage rec {
+            pname = "spendpoint";
+            version = "0.4.0";
+            format = "pyproject";
+            src = ./.;
+            nativeBuildInputs = [];
+            propagatedBuildInputs = with pkgs.python3Packages; [
+              #setuptools
+              flit-core
+              toml
+              arklog
+              rdflib
+              pandas
+              dacite
+              fastapi
+              pyarrow
+              requests
+              starlette
+              python-magic
+              uvicorn
+            ];
+            checkInputs = with pkgs.python3Packages; [
+              pytest
+              sparqlwrapper
+            ];
+            buildInputs = with pkgs.python3Packages; [
+              sphinx
+              tox
+              pip
+              flit
+              twine
+              numpy
+              invoke
+              jinja2
+              flake8
+              coverage
+            ];
+          };
+        };
+        defaultPackage = packages.spendpoint;
+      });
+  nixConfig.bash-prompt-prefix = "\\e\[94;1m[spendpoint]\\e\[m ";
+}

+ 14 - 14
pyproject.toml

@@ -22,35 +22,35 @@ keywords = ["spendpoint"]
 dependencies = [
     "toml~=0.10.2",
     "arklog~=0.5.1",
-    "rdflib~=6.3.2",
+    "rdflib~=7.0.0",
     "pandas~=2.0.1",
     "dacite~=1.8.1",
-    "fastapi~=0.95.2",
-    "pyarrow~=12.0.0",
-    "requests~=2.30.0",
-    "starlette~=0.27",
+    "fastapi~=0.101.0",
+    "pyarrow~=12.0.1",
+    "requests~=2.31.0",
+    "starlette~=0.31.0",
     "python-magic~=0.4.27",
-    "uvicorn[standard]~=0.22.0",
+    "uvicorn[standard]~=0.23.2",
 ]
 
 [project.optional-dependencies]
 test = [
-    "pytest~=7.3.1",
+    "pytest~=7.4.0",
     "sparqlwrapper~=2.0.0",
 ]
 doc = [
-    "sphinx~=7.0.1",
+    "sphinx~=7.1.2",
 ]
 dev = [
-    "tox~=4.5.1",
-    "pip~=23.1.2",
+    "tox~=4.6.4",
+    "pip~=23.2.1",
     "flit~=3.9.0",
     "twine~=4.0.2",
-    "numpy~=1.24.3",
-    "invoke~=2.1.2",
+    "numpy~=1.25.2",
+    "invoke~=2.2.0",
     "jinja2~=3.1.2",
-    "flake8~=6.0.0",
-    "coverage~=7.2.5",
+    "flake8~=6.1.0",
+    "coverage~=7.2.7",
 ]
 
 [project.urls]

+ 14 - 14
requirements.txt

@@ -1,27 +1,27 @@
 # SpEndPoint
 toml              ~= 0.10.2
 arklog            ~= 0.5.1
-rdflib            ~= 6.3.2
+rdflib            ~= 7.0.0
 pandas            ~= 2.0.1
 dacite            ~= 1.8.1
-fastapi           ~= 0.95.2
-pyarrow           ~= 12.0.0
-requests          ~= 2.30.0
-starlette         ~= 0.27
+fastapi           ~= 0.101.0
+pyarrow           ~= 12.0.1
+requests          ~= 2.31.0
+starlette         ~= 0.31.0
 python-magic      ~= 0.4.27
-uvicorn[standard] ~= 0.22.0
+uvicorn[standard] ~= 0.23.2
 # Test
-pytest        ~= 7.3.1
+pytest        ~= 7.4.0
 sparqlwrapper ~= 2.0.0
 # Doc
-sphinx ~= 7.0.1
+sphinx ~= 7.1.2
 # Dev
-tox      ~= 4.5.1
-pip      ~= 23.1.2
+tox      ~= 4.6.4
+pip      ~= 23.2.1
 flit     ~= 3.9.0
 twine    ~= 4.0.2
-numpy    ~= 1.24.3
-invoke   ~= 2.1.2
+numpy    ~= 1.25.2
+invoke   ~= 2.2.0
 jinja2   ~= 3.1.2
-flake8   ~= 6.0.0
-coverage ~= 7.2.5
+flake8   ~= 6.1.0
+coverage ~= 7.2.7