Merge pull request #206 from NeoLight1010/Feature_PoetryImplementation

Poetry Implementation

Author: PSNAppz

.gitignore

@@ -25,9 +25,11 @@ torBot
 .*.swp
 .ropeproject/
 .idea/
+.vscode/
 .DS_Store
 
 venv/
+.venv/
 *.csv
 .DS_Store
 .env

.travis.yml

@@ -1,13 +1,14 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: python
 cache: pip3
 python:
-  - "3.6"
+  - "3.9"
 # command to install dependencies
 install:
-  - sudo apt-get -y install python3-pip
-  - pip3 install -r requirements.txt
+  - pip install poetry
+  - poetry config virtualenvs.create false
+  - poetry install
   - cd src/modules/tests
 script: 
   - pytest

README.md

@@ -65,17 +65,20 @@ Contributor name will be updated to the below list. 😀
 
 ### OS Dependencies
 - Tor
-- Python 3.x
+- Python ^3.7
 - Golang 1.x (Not Currently Used)
 
 ### Python Dependencies
+
+(see pyproject.toml for more detail)
 - beautifulsoup4
 - pyinstaller
 - PySocks
 - termcolor
 - requests
 - requests_mock
 - yattag
+- numpy
 
 
 ## Basic setup
@@ -86,8 +89,13 @@ Before you run the torBot make sure the following things are done properly:
 
 * Make sure that your torrc is configured to SOCKS_PORT localhost:9050
 
+* Install [Poetry](https://python-poetry.org/docs/)
+
+* Disable Poetry virtualenvs (not required)
+`poetry config settings.virtualenvs.create false`
+
 * Install TorBot Python requirements
-`pip3 install -r requirements.txt`
+`poetry install`
 
 On Linux platforms, you can make an executable for TorBot by using the install.sh script.
 You will need to give the script the correct permissions using `chmod +x install.sh`
@@ -126,9 +134,9 @@ Read more about torrc here : [Torrc](https://github.com/DedSecInside/TorBoT/blob
 #### Using Docker
 
 - Ensure than you have a tor container running on port 9050.
-- Build the image using following command:
+- Build the image using following command (in the root directory):
 
-    `docker build -t dedsecinside/torbot .`
+    `docker build -f docker/Dockerfile -t dedsecinside/torbot .`
 - Run the container (make sure to link the tor container as `tor`):
 
     `docker run --link tor:tor --rm -ti dedsecinside/torbot`

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-stretch
+FROM python:3
 LABEL maintainer="dedsec_inside"
 
 # Install PyQt5
@@ -11,7 +11,9 @@ WORKDIR /app
 
 COPY . .
 
-RUN pip install -r requirements.txt
+RUN pip install --no-cache-dir poetry
+RUN poetry config virtualenvs.create false
+RUN python -m poetry install --no-dev
 
 RUN chmod +x install.sh
 RUN bash install.sh

install.sh

@@ -4,10 +4,10 @@
 mkdir -p tmp_build 
 mkdir -p tmp_dist
 
-pip install pyinstaller 
+pip install pyinstaller
 
 # Creates executable file and sends dependences to the recently created directories
-pyinstaller --onefile --workpath ./tmp_build --distpath ./tmp_dist src/torBot.py
+pyinstaller --onefile --workpath ./tmp_build --distpath ./tmp_dist --paths=src src/torBot.py
 
 # Puts the executable in the current directory
 mv tmp_dist/torBot .