From 83e26f1428fccf526c2f287f37a54aa82228989a Mon Sep 17 00:00:00 2001 From: Jeffrey Serio Date: Thu, 7 Nov 2024 18:07:21 -0600 Subject: [PATCH] Rm devenv; use requirements.txt + venv --- .envrc | 4 +- .gitignore | 9 +--- devenv.lock | 116 ----------------------------------------------- devenv.nix | 34 -------------- devenv.yaml | 15 ------ requirements.txt | 24 ++++++++++ 6 files changed, 26 insertions(+), 176 deletions(-) delete mode 100644 devenv.lock delete mode 100644 devenv.nix delete mode 100644 devenv.yaml create mode 100644 requirements.txt diff --git a/.envrc b/.envrc index 894571b..94840b3 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1 @@ -source_url "https://raw.githubusercontent.com/cachix/devenv/82c0147677e510b247d8b9165c54f73d32dfd899/direnvrc" "sha256-7u4iDd1nZpxL4tCzmPG0dQgC5V+/44Ba+tHkPob1v2k=" - -use devenv +layout python3 diff --git a/.gitignore b/.gitignore index 81f0f67..b6628c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ .direnv -# Devenv -.devenv* -devenv.local.nix +.venv -# direnv -.direnv - -# pre-commit -.pre-commit-config.yaml diff --git a/devenv.lock b/devenv.lock deleted file mode 100644 index effe809..0000000 --- a/devenv.lock +++ /dev/null @@ -1,116 +0,0 @@ -{ - "nodes": { - "devenv": { - "locked": { - "dir": "src/modules", - "lastModified": 1730745597, - "owner": "cachix", - "repo": "devenv", - "rev": "7cfc04e544e67adf803c3634b53a911c670e046e", - "type": "github" - }, - "original": { - "dir": "src/modules", - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1716977621, - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1730814269, - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "devenv": "devenv", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/devenv.nix b/devenv.nix deleted file mode 100644 index e0c64a3..0000000 --- a/devenv.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, lib, config, inputs, ... }: - -{ - # https://devenv.sh/basics/ - env.GREET = "devenv"; - - # https://devenv.sh/packages/ - packages = [ - pkgs.git - pkgs.python312Packages.beautifulsoup4 - pkgs.python312Packages.black - pkgs.python312Packages.bpython - pkgs.python312Packages.docopt - pkgs.python312Packages.isort - pkgs.python312Packages.pandas - pkgs.python312Packages.pytest - pkgs.python312Packages.qbittorrent-api - pkgs.python312Packages.requests - pkgs.python312Packages.resend - pkgs.python312Packages.rich - pkgs.python312Packages.tabulate - pkgs.pyright - pkgs.shellcheck - ]; - - # https://devenv.sh/languages/ - # languages.rust.enable = true; - languages.python.enable = true; - - enterShell = '' - hello - git --version - ''; -} diff --git a/devenv.yaml b/devenv.yaml deleted file mode 100644 index 116a2ad..0000000 --- a/devenv.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json -inputs: - nixpkgs: - url: github:cachix/devenv-nixpkgs/rolling - -# If you're using non-OSS software, you can set allowUnfree to true. -# allowUnfree: true - -# If you're willing to use a package that's vulnerable -# permittedInsecurePackages: -# - "openssl-1.1.1w" - -# If you have more than one devenv you can merge them -#imports: -# - ./backend diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e123802 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,24 @@ +attr==0.3.2 +beautifulsoup4==4.12.3 +colorama==0.4.6 +ConfigParser==7.1.0 +cryptography==43.0.3 +docopt==0.6.2 +docutils==0.21.2 +filelock==3.16.1 +HTMLParser==0.0.2 +ipython==8.29.0 +ipywidgets==8.1.5 +jnius==1.1.0 +keyring==25.5.0 +pandas==2.2.3 +Pillow==11.0.0 +protobuf==5.28.3 +pyOpenSSL==24.2.1 +qbittorrent==0.1.6 +redis==5.2.0 +resend==2.4.0 +Sphinx==8.1.3 +thread==2.0.5 +urllib3_secure_extra==0.1.0 +xmlrpclib==1.0.1