From 0bef0f095ed8e2cf97c6531bd0c989e0527ed796 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Thu, 9 Dec 2021 13:37:04 +0100 Subject: [PATCH] switch to poetry --- flake.lock | 339 ++++++++++++++++++++++++++++--------------------- flake.nix | 39 ++---- poetry.lock | 134 +++++++++++++++++++ pyproject.toml | 25 ++++ setup.cfg | 5 - setup.py | 101 --------------- 6 files changed, 363 insertions(+), 280 deletions(-) create mode 100644 poetry.lock create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/flake.lock b/flake.lock index 09f720f..86a528b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,15 @@ "nodes": { "binfootprint": { "inputs": { - "flake-utils": "flake-utils", - "mach-nix": "mach-nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs", + "utils": "utils" }, "locked": { - "lastModified": 1638902364, - "narHash": "sha256-XkXNBM6/CJd8soHZQHugtfPUQOKL+dtC5IVCV+d34us=", + "lastModified": 1639052357, + "narHash": "sha256-07LBV1XA++fF/aplSPahskrrH3d3GIovJJ3AnoDuH6o=", "owner": "vale981", "repo": "binfootprint", - "rev": "090f17d7aaf599614d0752c97e1825bd93eb0a8d", + "rev": "2c922d90f295802ce080c0e079cb4fbc24aba749", "type": "github" }, "original": { @@ -37,11 +36,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -67,11 +66,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -97,11 +96,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -110,73 +109,13 @@ "type": "github" } }, - "mach-nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", - "pypi-deps-db": "pypi-deps-db" - }, - "locked": { - "lastModified": 1637687243, - "narHash": "sha256-Qm0hPR9ZT1EP7lRW4udAPeb4yv6D2ONcw9ayterTP18=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "31b21203a1350bff7c541e9dfdd4e07f76d874be", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "mach-nix", - "type": "github" - } - }, - "mach-nix_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", - "pypi-deps-db": "pypi-deps-db_2" - }, - "locked": { - "lastModified": 1637687243, - "narHash": "sha256-Qm0hPR9ZT1EP7lRW4udAPeb4yv6D2ONcw9ayterTP18=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "31b21203a1350bff7c541e9dfdd4e07f76d874be", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "mach-nix", - "type": "github" - } - }, - "mach-nix_3": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_5", - "pypi-deps-db": "pypi-deps-db_3" - }, - "locked": { - "lastModified": 1637687243, - "narHash": "sha256-Qm0hPR9ZT1EP7lRW4udAPeb4yv6D2ONcw9ayterTP18=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "31b21203a1350bff7c541e9dfdd4e07f76d874be", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "mach-nix", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1622797669, - "narHash": "sha256-xIyWeoYExzF0KNaKcqfxEX58fN4JTIQxTJWbsAujllc=", + "lastModified": 1638806821, + "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae", + "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff", "type": "github" }, "original": { @@ -202,17 +141,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1622797669, - "narHash": "sha256-xIyWeoYExzF0KNaKcqfxEX58fN4JTIQxTJWbsAujllc=", + "lastModified": 1610729867, + "narHash": "sha256-bk/SBaBLqZX/PEqal27DMQwAHHl0dcZMp8NNksQr80s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae", + "rev": "04af07c659c6723a2259bb6bc00a47ec53330f20", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { @@ -232,11 +171,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1622797669, - "narHash": "sha256-xIyWeoYExzF0KNaKcqfxEX58fN4JTIQxTJWbsAujllc=", + "lastModified": 1638806821, + "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ca6b0a0cc38dbba0441202535c92841dd39d1ae", + "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff", "type": "github" }, "original": { @@ -260,18 +199,119 @@ "type": "indirect" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1610729867, + "narHash": "sha256-bk/SBaBLqZX/PEqal27DMQwAHHl0dcZMp8NNksQr80s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04af07c659c6723a2259bb6bc00a47ec53330f20", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1638806821, + "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1610729867, + "narHash": "sha256-bk/SBaBLqZX/PEqal27DMQwAHHl0dcZMp8NNksQr80s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04af07c659c6723a2259bb6bc00a47ec53330f20", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1638854297, + "narHash": "sha256-mt5gMwAThp8FpcvRsKhs/y/VxLDNgH4MJJLlFbbs4gk=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "a4b769203284c91529480adcbb4f17f04d3ff67b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "poetry2nix_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1638854297, + "narHash": "sha256-mt5gMwAThp8FpcvRsKhs/y/VxLDNgH4MJJLlFbbs4gk=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "a4b769203284c91529480adcbb4f17f04d3ff67b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "poetry2nix_3": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1638854297, + "narHash": "sha256-mt5gMwAThp8FpcvRsKhs/y/VxLDNgH4MJJLlFbbs4gk=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "a4b769203284c91529480adcbb4f17f04d3ff67b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "progression": { "inputs": { - "flake-utils": "flake-utils_5", - "mach-nix": "mach-nix_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5", + "utils": "utils_2" }, "locked": { - "lastModified": 1638904081, - "narHash": "sha256-AQnQEwr63mZLPJ/BcY/7Kyr/3Qb+KfUGepfISPZLVVI=", + "lastModified": 1639052847, + "narHash": "sha256-NQTqDDNSEzEUOFdwvq5zyPd8ZV0bqC591LdzX5wBFnE=", "owner": "vale981", "repo": "progression", - "rev": "4a559dbdfcb84a516eee64d502475e16f19238ce", + "rev": "69fb97418000ae0957228c0bb99ee57338c0d20d", "type": "github" }, "original": { @@ -280,61 +320,72 @@ "type": "github" } }, - "pypi-deps-db": { - "flake": false, - "locked": { - "lastModified": 1622970040, - "narHash": "sha256-u//RFnae/XMIhoy83G2uH2Qu/1LiUhVCdwwY1xj4Ufs=", - "owner": "DavHau", - "repo": "pypi-deps-db", - "rev": "be6591698c67a86a69c81fef72167e38d038a9fc", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", - "type": "github" - } - }, - "pypi-deps-db_2": { - "flake": false, - "locked": { - "lastModified": 1622970040, - "narHash": "sha256-u//RFnae/XMIhoy83G2uH2Qu/1LiUhVCdwwY1xj4Ufs=", - "owner": "DavHau", - "repo": "pypi-deps-db", - "rev": "be6591698c67a86a69c81fef72167e38d038a9fc", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", - "type": "github" - } - }, - "pypi-deps-db_3": { - "flake": false, - "locked": { - "lastModified": 1622970040, - "narHash": "sha256-u//RFnae/XMIhoy83G2uH2Qu/1LiUhVCdwwY1xj4Ufs=", - "owner": "DavHau", - "repo": "pypi-deps-db", - "rev": "be6591698c67a86a69c81fef72167e38d038a9fc", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", - "type": "github" - } - }, "root": { "inputs": { "binfootprint": "binfootprint", - "flake-utils": "flake-utils_3", - "mach-nix": "mach-nix_2", "nixpkgs": "nixpkgs_4", - "progression": "progression" + "progression": "progression", + "utils": "utils_3" + } + }, + "utils": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1639048342, + "narHash": "sha256-yCXljSLi+NbnCH3xjXpnAU2sSpVwOADxApKoq2V505Y=", + "owner": "vale981", + "repo": "hiro-flake-utils", + "rev": "f16b44df6316d72ebc5c96cf8af8833dccf3114d", + "type": "github" + }, + "original": { + "owner": "vale981", + "repo": "hiro-flake-utils", + "type": "github" + } + }, + "utils_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6", + "poetry2nix": "poetry2nix_2" + }, + "locked": { + "lastModified": 1639052540, + "narHash": "sha256-xe9YsBNBAHtoIeEQpB1wYAVZjAgNp7y5UT7X0Dz2aBw=", + "owner": "vale981", + "repo": "hiro-flake-utils", + "rev": "a0d6150bc8a4a2a4af78b66b5aa3342f8a9e71b4", + "type": "github" + }, + "original": { + "owner": "vale981", + "repo": "hiro-flake-utils", + "type": "github" + } + }, + "utils_3": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_8", + "poetry2nix": "poetry2nix_3" + }, + "locked": { + "lastModified": 1639052540, + "narHash": "sha256-xe9YsBNBAHtoIeEQpB1wYAVZjAgNp7y5UT7X0Dz2aBw=", + "owner": "vale981", + "repo": "hiro-flake-utils", + "rev": "a0d6150bc8a4a2a4af78b66b5aa3342f8a9e71b4", + "type": "github" + }, + "original": { + "owner": "vale981", + "repo": "hiro-flake-utils", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index eb46e14..dccb5fc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,40 +1,19 @@ { description = "Python job manager for parallel computing."; + inputs = { + utils.url = "github:vale981/hiro-flake-utils"; nixpkgs.url = "nixpkgs/nixos-unstable"; - mach-nix.url = "github:DavHau/mach-nix"; - flake-utils.url = "github:numtide/flake-utils"; binfootprint.url = "github:vale981/binfootprint"; progression.url = "github:vale981/progression"; }; - outputs = { self, nixpkgs, flake-utils, mach-nix, binfootprint, progression }: - let - python = "python39"; - - in flake-utils.lib.eachSystem ["x86_64-linux"] (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - mach-nix-wrapper = import mach-nix { inherit pkgs python; }; - - jobmanager = (mach-nix-wrapper.buildPythonPackage { - src = ./.; - propagatedBuildInputs = [ - binfootprint.defaultPackage.${system} - progression.defaultPackage.${system} - ]; - }); - - pythonShell = mach-nix-wrapper.mkPython { - packagesExtra = [jobmanager]; - }; - - in { - devShell = pkgs.mkShell { - buildInputs = with pkgs; [pythonShell black pyright]; - }; - - defaultPackage = jobmanager; - }); + outputs = pythonPackages@{ self, utils, nixpkgs, ... }: + (utils.lib.poetry2nixWrapper nixpkgs pythonPackages { + name = "jobmanager"; + poetryArgs = { + projectDir = ./.; + }; + }); } diff --git a/poetry.lock b/poetry.lock new file mode 100644 index 0000000..1f3d1ce --- /dev/null +++ b/poetry.lock @@ -0,0 +1,134 @@ +[[package]] +name = "binfootprint" +version = "0.1.0" +description = "binary representation for simple data structures" +category = "main" +optional = false +python-versions = ">=3.9,<3.11" +develop = false + +[package.dependencies] +numpy = "^1.5.1" + +[package.source] +type = "git" +url = "https://github.com/vale981/binfootprint" +reference = "master" +resolved_reference = "2c922d90f295802ce080c0e079cb4fbc24aba749" + +[[package]] +name = "numpy" +version = "1.21.4" +description = "NumPy is the fundamental package for array computing with Python." +category = "main" +optional = false +python-versions = ">=3.7,<3.11" + +[[package]] +name = "progression" +version = "0.1.4" +description = "A python progress bar in ascii art." +category = "main" +optional = false +python-versions = ">=3.9,<3.11" +develop = false + +[package.source] +type = "git" +url = "https://github.com/vale981/progression" +reference = "master" +resolved_reference = "69fb97418000ae0957228c0bb99ee57338c0d20d" + +[[package]] +name = "scipy" +version = "1.7.3" +description = "SciPy: Scientific Library for Python" +category = "main" +optional = false +python-versions = ">=3.7,<3.11" + +[package.dependencies] +numpy = ">=1.16.5,<1.23.0" + +[[package]] +name = "sqlitedict" +version = "1.7.0" +description = "Persistent dict in Python, backed up by sqlite3 and pickle, multithread-safe." +category = "main" +optional = false +python-versions = "*" + +[metadata] +lock-version = "1.1" +python-versions = ">=3.9,<3.11" +content-hash = "3d9beafc7fb68ece2ac316cf24a20baaaeed558db37bcfa35b31490c721f7639" + +[metadata.files] +binfootprint = [] +numpy = [ + {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8890b3360f345e8360133bc078d2dacc2843b6ee6059b568781b15b97acbe39f"}, + {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:69077388c5a4b997442b843dbdc3a85b420fb693ec8e33020bb24d647c164fa5"}, + {file = "numpy-1.21.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e89717274b41ebd568cd7943fc9418eeb49b1785b66031bc8a7f6300463c5898"}, + {file = "numpy-1.21.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b78ecfa070460104934e2caf51694ccd00f37d5e5dbe76f021b1b0b0d221823"}, + {file = "numpy-1.21.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:615d4e328af7204c13ae3d4df7615a13ff60a49cb0d9106fde07f541207883ca"}, + {file = "numpy-1.21.4-cp310-cp310-win_amd64.whl", hash = "sha256:1403b4e2181fc72664737d848b60e65150f272fe5a1c1cbc16145ed43884065a"}, + {file = "numpy-1.21.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:74b85a17528ca60cf98381a5e779fc0264b4a88b46025e6bcbe9621f46bb3e63"}, + {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92aafa03da8658609f59f18722b88f0a73a249101169e28415b4fa148caf7e41"}, + {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5d95668e727c75b3f5088ec7700e260f90ec83f488e4c0aaccb941148b2cd377"}, + {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5162ec777ba7138906c9c274353ece5603646c6965570d82905546579573f73"}, + {file = "numpy-1.21.4-cp37-cp37m-win32.whl", hash = "sha256:81225e58ef5fce7f1d80399575576fc5febec79a8a2742e8ef86d7b03beef49f"}, + {file = "numpy-1.21.4-cp37-cp37m-win_amd64.whl", hash = "sha256:32fe5b12061f6446adcbb32cf4060a14741f9c21e15aaee59a207b6ce6423469"}, + {file = "numpy-1.21.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:c449eb870616a7b62e097982c622d2577b3dbc800aaf8689254ec6e0197cbf1e"}, + {file = "numpy-1.21.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2e4ed57f45f0aa38beca2a03b6532e70e548faf2debbeb3291cfc9b315d9be8f"}, + {file = "numpy-1.21.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1247ef28387b7bb7f21caf2dbe4767f4f4175df44d30604d42ad9bd701ebb31f"}, + {file = "numpy-1.21.4-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:34f3456f530ae8b44231c63082c8899fe9c983fd9b108c997c4b1c8c2d435333"}, + {file = "numpy-1.21.4-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4c9c23158b87ed0e70d9a50c67e5c0b3f75bcf2581a8e34668d4e9d7474d76c6"}, + {file = "numpy-1.21.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4799be6a2d7d3c33699a6f77201836ac975b2e1b98c2a07f66a38f499cb50ce"}, + {file = "numpy-1.21.4-cp38-cp38-win32.whl", hash = "sha256:bc988afcea53e6156546e5b2885b7efab089570783d9d82caf1cfd323b0bb3dd"}, + {file = "numpy-1.21.4-cp38-cp38-win_amd64.whl", hash = "sha256:170b2a0805c6891ca78c1d96ee72e4c3ed1ae0a992c75444b6ab20ff038ba2cd"}, + {file = "numpy-1.21.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:fde96af889262e85aa033f8ee1d3241e32bf36228318a61f1ace579df4e8170d"}, + {file = "numpy-1.21.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c885bfc07f77e8fee3dc879152ba993732601f1f11de248d4f357f0ffea6a6d4"}, + {file = "numpy-1.21.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9e6f5f50d1eff2f2f752b3089a118aee1ea0da63d56c44f3865681009b0af162"}, + {file = "numpy-1.21.4-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad010846cdffe7ec27e3f933397f8a8d6c801a48634f419e3d075db27acf5880"}, + {file = "numpy-1.21.4-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c74c699b122918a6c4611285cc2cad4a3aafdb135c22a16ec483340ef97d573c"}, + {file = "numpy-1.21.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9864424631775b0c052f3bd98bc2712d131b3e2cd95d1c0c68b91709170890b0"}, + {file = "numpy-1.21.4-cp39-cp39-win32.whl", hash = "sha256:b1e2312f5b8843a3e4e8224b2b48fe16119617b8fc0a54df8f50098721b5bed2"}, + {file = "numpy-1.21.4-cp39-cp39-win_amd64.whl", hash = "sha256:e3c3e990274444031482a31280bf48674441e0a5b55ddb168f3a6db3e0c38ec8"}, + {file = "numpy-1.21.4-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a3deb31bc84f2b42584b8c4001c85d1934dbfb4030827110bc36bfd11509b7bf"}, + {file = "numpy-1.21.4.zip", hash = "sha256:e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"}, +] +progression = [] +scipy = [ + {file = "scipy-1.7.3-1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:c9e04d7e9b03a8a6ac2045f7c5ef741be86727d8f49c45db45f244bdd2bcff17"}, + {file = "scipy-1.7.3-1-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:b0e0aeb061a1d7dcd2ed59ea57ee56c9b23dd60100825f98238c06ee5cc4467e"}, + {file = "scipy-1.7.3-1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:b78a35c5c74d336f42f44106174b9851c783184a85a3fe3e68857259b37b9ffb"}, + {file = "scipy-1.7.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:173308efba2270dcd61cd45a30dfded6ec0085b4b6eb33b5eb11ab443005e088"}, + {file = "scipy-1.7.3-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:21b66200cf44b1c3e86495e3a436fc7a26608f92b8d43d344457c54f1c024cbc"}, + {file = "scipy-1.7.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ceebc3c4f6a109777c0053dfa0282fddb8893eddfb0d598574acfb734a926168"}, + {file = "scipy-1.7.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f7eaea089345a35130bc9a39b89ec1ff69c208efa97b3f8b25ea5d4c41d88094"}, + {file = "scipy-1.7.3-cp310-cp310-win_amd64.whl", hash = "sha256:304dfaa7146cffdb75fbf6bb7c190fd7688795389ad060b970269c8576d038e9"}, + {file = "scipy-1.7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:033ce76ed4e9f62923e1f8124f7e2b0800db533828c853b402c7eec6e9465d80"}, + {file = "scipy-1.7.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4d242d13206ca4302d83d8a6388c9dfce49fc48fdd3c20efad89ba12f785bf9e"}, + {file = "scipy-1.7.3-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8499d9dd1459dc0d0fe68db0832c3d5fc1361ae8e13d05e6849b358dc3f2c279"}, + {file = "scipy-1.7.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca36e7d9430f7481fc7d11e015ae16fbd5575615a8e9060538104778be84addf"}, + {file = "scipy-1.7.3-cp37-cp37m-win32.whl", hash = "sha256:e2c036492e673aad1b7b0d0ccdc0cb30a968353d2c4bf92ac8e73509e1bf212c"}, + {file = "scipy-1.7.3-cp37-cp37m-win_amd64.whl", hash = "sha256:866ada14a95b083dd727a845a764cf95dd13ba3dc69a16b99038001b05439709"}, + {file = "scipy-1.7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:65bd52bf55f9a1071398557394203d881384d27b9c2cad7df9a027170aeaef93"}, + {file = "scipy-1.7.3-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:f99d206db1f1ae735a8192ab93bd6028f3a42f6fa08467d37a14eb96c9dd34a3"}, + {file = "scipy-1.7.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5f2cfc359379c56b3a41b17ebd024109b2049f878badc1e454f31418c3a18436"}, + {file = "scipy-1.7.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb7ae2c4dbdb3c9247e07acc532f91077ae6dbc40ad5bd5dca0bb5a176ee9bda"}, + {file = "scipy-1.7.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95c2d250074cfa76715d58830579c64dff7354484b284c2b8b87e5a38321672c"}, + {file = "scipy-1.7.3-cp38-cp38-win32.whl", hash = "sha256:87069cf875f0262a6e3187ab0f419f5b4280d3dcf4811ef9613c605f6e4dca95"}, + {file = "scipy-1.7.3-cp38-cp38-win_amd64.whl", hash = "sha256:7edd9a311299a61e9919ea4192dd477395b50c014cdc1a1ac572d7c27e2207fa"}, + {file = "scipy-1.7.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:eef93a446114ac0193a7b714ce67659db80caf940f3232bad63f4c7a81bc18df"}, + {file = "scipy-1.7.3-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:eb326658f9b73c07081300daba90a8746543b5ea177184daed26528273157294"}, + {file = "scipy-1.7.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:93378f3d14fff07572392ce6a6a2ceb3a1f237733bd6dcb9eb6a2b29b0d19085"}, + {file = "scipy-1.7.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edad1cf5b2ce1912c4d8ddad20e11d333165552aba262c882e28c78bbc09dbf6"}, + {file = "scipy-1.7.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d1cc2c19afe3b5a546ede7e6a44ce1ff52e443d12b231823268019f608b9b12"}, + {file = "scipy-1.7.3-cp39-cp39-win32.whl", hash = "sha256:2c56b820d304dffcadbbb6cbfbc2e2c79ee46ea291db17e288e73cd3c64fefa9"}, + {file = "scipy-1.7.3-cp39-cp39-win_amd64.whl", hash = "sha256:3f78181a153fa21c018d346f595edd648344751d7f03ab94b398be2ad083ed3e"}, + {file = "scipy-1.7.3.tar.gz", hash = "sha256:ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"}, +] +sqlitedict = [ + {file = "sqlitedict-1.7.0.tar.gz", hash = "sha256:2affcc301aacd4da7511692601ecbde392294205af418498f7d6d3ec0dbcad56"}, +] diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..1438556 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,25 @@ +[tool.poetry] +name = "jobmanager" +version = "0.3.0" +description = "Python job manager for parallel computing." +authors = ["Richard Hartmann ", "Paul Müller"] +license = "BSD (3 clause)" +classifiers = [ + "Operating System :: OS Independent", + "Intended Audience :: Research", +] +repository = "https://github.com/cimatosa/jobmanager" + +[tool.poetry.dependencies] +python = ">=3.9,<3.11" +sqlitedict = "^1.7.0" +numpy = "^1.21.4" +scipy = "^1.7.3" +binfootprint = { git = "https://github.com/vale981/binfootprint" } +progression = { git = "https://github.com/vale981/progression" } + +[tool.poetry.dev-dependencies] + +[build-system] +requires = ["poetry>=0.12"] +build-backend = "poetry.core.masonry.api" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 861a9f5..0000000 --- a/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[egg_info] -tag_build = -tag_date = 0 -tag_svn_revision = 0 - diff --git a/setup.py b/setup.py deleted file mode 100644 index b09dfc2..0000000 --- a/setup.py +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# To create a distribution package for pip or easy-install: -# python setup.py sdist -from os.path import join, dirname, realpath -from setuptools import setup, find_packages, Command -import subprocess as sp -from warnings import warn - -author = u"Richard Hartmann" -authors = [author, u"Paul Müller"] -name = "jobmanager" -description = "Python job manager for parallel computing." -year = "2015" - -DIR = realpath(dirname(__file__)) - -longdescription = open(join(DIR, "doc/description.txt"), "r").read().strip() - - -class PyDocGitHub(Command): - """Upload the docs to GitHub gh-pages branch""" - - user_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - errno = sp.call([sys.executable, "doc/commit_gh-pages.py"]) - raise SystemExit(errno) - - -class PyTest(Command): - """Perform pytests""" - - user_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - import sys, subprocess - - errno = sp.call([sys.executable, "tests/runtests.py"]) - raise SystemExit(errno) - - -try: - import sys - import os - - sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/" + name) - # get version number - from jm_version import __version__ as version -except: - version = "unknown" - - -if __name__ == "__main__": - setup( - name=name, - author=author, - url="https://github.com/cimatosa/jobmanager", - version=version, - packages=[name], - package_dir={name: name}, - license="MIT", - description=description, - long_description=longdescription, - install_requires=["sqlitedict>=1.2.0", "NumPy>=1.5.1", "scipy"], - tests_require=["psutil"], - keywords=[ - "multiprocessing", - "queue", - "parallel", - "distributed", - "computing", - "progress", - "manager", - "job", - "persistent data", - "scheduler", - ], - classifiers=[ - "Operating System :: OS Independent", - "Programming Language :: Python :: 3.6", - "Intended Audience :: Science/Research", - ], - platforms=["ALL"], - cmdclass={ - "test": PyTest, - "commit_doc": PyDocGitHub, - }, - )