Split up requirements that default official plugins have

README.md

@@ -88,9 +88,9 @@ Master may be unstable, you should use the latest release tag. (checkout via git
 * You may need build-essentials or the equivalent of your platform
 * Clone the git repo: `$ git clone https://gitlab.com/beardog/onionr --tags`
 * cd into install direction: `$ cd onionr/`
-* Install the Python dependencies ([virtualenv strongly recommended](https://virtualenv.pypa.io/en/stable/userguide/)): `$ pip3 install --require-hashes -r requirements.txt`
+* Install the Python dependencies ([virtualenv strongly recommended](https://virtualenv.pypa.io/en/stable/userguide/)): `$ pip3 install --require-hashes -r requirements-x86-all-plugins.txt`
 
-Require-hashes is suggested for security but is optional. The hashes are not correct for ARM machines.
+Require-hashes is suggested for supply-chain security but is optional. The hashes are not correct for ARM machines. If you are just running a node or want a bare-bones install you can use requirements-base-x86.txt and selectively install the requirements.txt files in static-data/official-plugins/ subdirectories
 
 ## Run Onionr
 

install-dependencies.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# install base dependencies
-pip install -r requirements.txt --user --require-hashes
-
-# iterate plugin directories for their dependencies
-
-for d in static-data/default-plugins/*; do
-    if [ -d "$d" ]; then
-        echo "Installing dependencies for $d"
-        pip install -r $d/requirements.txt --user --require-hashes
-    fi
-done

requirements-base-x86.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile --generate-hashes requirements-base.in
+#    pip-compile --generate-hashes --output-file=requirements-base-x86.txt requirements-base.in
 #
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \

requirements-base.in

@@ -1,5 +1,6 @@
 psutil==5.9.1
-filenuke==0.0.0
 ujson==5.4.0
-onionrblocks==7.0.0
-ordered-set==4.1.0
+ordered-set==4.1.0
+# These two are also by Kevin
+filenuke==0.0.0
+onionrblocks==7.0.0

requirements-x86-all-plugins.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile --generate-hashes --output-file=requirements-x86-all-plugins.txt requirements-base.in static-data/default-plugins/rpc/requirements.in static-data/default-plugins/tor/requirements.in static-data/default-plugins/wot/requirements.in
+#    pip-compile --generate-hashes --output-file=requirements-x86-all-plugins.txt requirements-base.in static-data/official-plugins/rpc/requirements.in static-data/official-plugins/tor/requirements.in static-data/official-plugins/wot/requirements.in
 #
 autocommand==2.2.1 \
     --hash=sha256:85d03044c2a1fc1c7844ac41545045927aecde0cbaf8ea28b88e0cd8588ce5d3 \
@@ -74,7 +74,7 @@ cffi==1.15.1 \
     --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \
     --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0
     # via
-    #   -r static-data/default-plugins/wot/requirements.in
+    #   -r static-data/official-plugins/wot/requirements.in
     #   pynacl
 cheroot==8.6.0 \
     --hash=sha256:366adf6e7cac9555486c2d1be6297993022eff6f8c4655c1443268cca3f08e25 \
@@ -83,7 +83,7 @@ cheroot==8.6.0 \
 cherrypy==18.8.0 \
     --hash=sha256:9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b \
     --hash=sha256:b56097025dc78a76a59db551b3a82871c6b3a0107b80b12ff759e4c0b3b947ce
-    # via -r static-data/default-plugins/rpc/requirements.in
+    # via -r static-data/official-plugins/rpc/requirements.in
 filenuke==0.0.0 \
     --hash=sha256:147011c0125121469cae0a8a7f4df399f470e54aa29a08f2d2c099bf0118dcee \
     --hash=sha256:c55535dcecfdb27c5f4ce664d46e115950b5429763b5db75c198053646177f8f
@@ -118,7 +118,7 @@ jaraco-text==3.9.1 \
 json-rpc==1.13.0 \
     --hash=sha256:84b45058e5ba95f49c7b6afcf7e03ab86bee89bf2c01f3ad8dd41fe114fc1f84 \
     --hash=sha256:def0dbcf5b7084fc31d677f2f5990d988d06497f2f47f13024274cfb2d5d7589
-    # via -r static-data/default-plugins/rpc/requirements.in
+    # via -r static-data/official-plugins/rpc/requirements.in
 kasten==3.0.0 \
     --hash=sha256:52894af46d6e1339f0d5fa8961892b292f99176848bce11877fe4a435b6782e5 \
     --hash=sha256:b22ebdc5f475c2ef9ab74abc36552add0b37732a7ce2be6bd7977ee41b2163b4
@@ -289,13 +289,13 @@ pynacl==1.5.0 \
     --hash=sha256:a422368fc821589c228f4c49438a368831cb5bbc0eab5ebe1d7fac9dded6567b \
     --hash=sha256:e46dae94e34b085175f8abb3b0aaa7da40767865ac82c928eeb9e57e1ea8a543
     # via
-    #   -r static-data/default-plugins/wot/requirements.in
+    #   -r static-data/official-plugins/wot/requirements.in
     #   onionrblocks
 pysocks==1.7.1 \
     --hash=sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299 \
     --hash=sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5 \
     --hash=sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0
-    # via -r static-data/default-plugins/tor/requirements.in
+    # via -r static-data/official-plugins/tor/requirements.in
 pytz==2022.2.1 \
     --hash=sha256:220f481bdafa09c3955dfbdddb7b57780e9a94f5127e35456a48589b9e0c0197 \
     --hash=sha256:cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5
@@ -306,7 +306,7 @@ six==1.16.0 \
     # via cheroot
 stem==1.8.0 \
     --hash=sha256:a0b48ea6224e95f22aa34c0bc3415f0eb4667ddeae3dfb5e32a6920c185568c2
-    # via -r static-data/default-plugins/tor/requirements.in
+    # via -r static-data/official-plugins/tor/requirements.in
 tempora==5.0.2 \
     --hash=sha256:31fa5bb33b2641026211f23e808eb8bd351901988b167d45f323c8f450ecf211 \
     --hash=sha256:e65d32ae68ad772ee738d802689f689b3f883e165e8dadd39aa89ef317b12b99