Bundle Python module "requests"

Author: cmallwitz

README.md

@@ -9,17 +9,18 @@ spreadsheets - currently supporting Yahoo's (FX, crypto, equities, indices, futu
 ## Latest version vs Yahoo HTTPS fingerprinting
 
 Latest version 3.8.0 was created to bypass Yahoo's recently adding crazy HTTPS fingerprinting 
-to their website. In a step back to before or rather a return to times long gone some Python modules need
-to be installed such that LibreOffice can find them. 
+to their website. In a step back to before or rather a return to times long gone some Python 
+modules need to be installed such that LibreOffice can find them - otherwise Yahoo will not work. 
 
-Ideally install module 'curl_cffi' (although 'requests' works as well if you don't intend to use Yahoo as source)
-using e.g. on my Ubuntu:
+Update for version: 3.8.1 - this bundles the Python 'requests' module so users using 'FT' as source
+should not require anything else.
 
-```sudo pip3 install curl_cffi --upgrade```
+Everyone else needs to install module 'curl_cffi' e.g. on my Ubuntu system:
 
-Previously this worked on Windows - as LibreOffice on Windows ships with its own, minimal Python runtime a 
-few more steps are required:
+- ```sudo pip3 install curl_cffi --upgrade```
 
+For Windows something along those lines used to work for other dependencies
+ 
 - Download the script https://bootstrap.pypa.io/get-pip.py to your computer
 
 - Start a Command Prompt (CMD) as Administrator on the command prompt run (change path as required)
@@ -28,18 +29,20 @@ few more steps are required:
 
     ```"c:\Program Files\LibreOffice\program\python.exe" -m pip install curl_cffi --upgrade```
 
-If you want to use Yahoo as a source you need to download latest binary of [curl-impersonate](https://github.com/lwthiker/curl-impersonate/releases) e.g. 
-libcurl-impersonate-v0.6.1.x86_64-linux-gnu.tar.gz and untar it somewhere 
+Then you need to download latest binary of [curl-impersonate](https://github.com/lwthiker/curl-impersonate/releases) e.g.
+(currently) libcurl-impersonate-v0.6.1.x86_64-linux-gnu.tar.gz and untar it somewhere 
 
 Now some of these bits need to be loaded/initialised before running LibreOffice: I used the below (adjust your location 
-to libcurl-impersonate-chrome.so) to run LibreOffice Calc directly from command line:
+to libcurl-impersonate-chrome.so) to run LibreOffice Calc directly from command line - alternatively you could 
+define LD_PRELOAD and CURL_IMPERSONATE in your environment e.g. by putting them in your .bashrc  
 
 ```
 LD_PRELOAD=/tmp/curl-impersonate/libcurl-impersonate-chrome.so CURL_IMPERSONATE=chrome101 /usr/lib/libreoffice/program/soffice.bin --calc
 ```
 
 With this I can see the below in the output from `=GETREALTIME("SUPPORT")` and the examples.ods file from this repo 
 can load data for Yahoo again.
+
 ```
 ...
 requests=curl_cffi_0.10.0
@@ -51,14 +54,21 @@ curl_version="libcurl/8.1.1 BoringSSL zlib/1.2.11 brotli/1.0.9 nghttp2/1.56.0"
 Similar things should be possible on Windows - let me know if [this](https://stackoverflow.com/questions/1178257/ld-preload-equivalent-for-windows-to-preload-shared-libraries)
 is helpful and share your experience.
 
+User report for Linux Mint: the command to install curl_cffi is:
+```
+sudo apt install python3-pip
+sudo pip3 install curl_cffi --upgrade --break-system-packages
+```
+and then adding the following to /etc/environment:
+```
+LD_PRELOAD=/home/rvkpbv/bin/libcurl-impersonate-chrome.so
+CURL_IMPERSONATE=chrome101
+```
+
 Background: for a normal Python script just installing curl_cffi is enough to bypass Yahoo's HTTPS fingerprinting. 
 Because LibreOffice is loading the stock curl library before executing the extension code directly, the above hack 
 is required. Unless someone tells me otherwise...
 
-### Feedback requested:
-
-Please provide feedback about using the extension [here](https://github.com/cmallwitz/Financials-Extension/issues/10)
-
 ### Usage:
 
 Under 'Releases' on GitHub [there](https://github.com/cmallwitz/Financials-Extension/releases) is a downloadable **Financials-Extension.oxt** file - load it into Calc 

compile.sh

@@ -59,7 +59,7 @@ cp -f "${PWD}"/src/financials_ft.py "${PWD}"/build/
 cp -f "${PWD}"/src/financials_yahoo.py "${PWD}"/build/
 cp -f "${PWD}"/src/financials_coinbase.py "${PWD}"/build/
 
-# this copies python modules dateutil, pytz, pyparsing to extension so it doesn't have to be installed by user
+# this copies python some modules to extension so they doesn't have to be installed by user
 
 TMPFILE=`mktemp`
 
@@ -75,11 +75,16 @@ wget "https://files.pythonhosted.org/packages/8a/bb/488841f56197b13700afd5658fc2
 unzip $TMPFILE pyparsing.py -d "${PWD}"/build/
 rm $TMPFILE
 
-# Windows LibreOffice 7.1 Python is missing this...
+# Windows LibreOffice Python is not including this by default...
 wget "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl" -O $TMPFILE
 unzip $TMPFILE six.py -d "${PWD}"/build/
 rm $TMPFILE
 
+# Windows LibreOffice Python is not including this by default...
+wget "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl" -O $TMPFILE
+unzip $TMPFILE requests/\* -d "${PWD}"/build/
+rm $TMPFILE
+
 echo "Package into oxt file..."
 pushd "${PWD}"/build/
 zip -r "${PWD}"/Financials-Extension.zip ./*

src/generate_metainfo.py

@@ -14,7 +14,7 @@
 cur_dir = os.getcwd()
 
 addin_id = "com.financials.getinfo"
-addin_version = "3.8.0"
+addin_version = "3.8.1"
 addin_displayname = "Financial Market Extension"
 addin_publisher_link = "https://github.com/cmallwitz/Financials-Extension"
 addin_publisher_name = "The Publisher"