diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75f72f8..88c4b1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,13 +118,13 @@ jobs: run: | # Require cryptography >= 3.1 because in 3.0 and below, the backend param in load_key_and_certificates was still required. # Installing a forked version of oscrypto to fix OpenSSL 3 issues - pip3 install https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.3.0_fork_fe39273cc5020_new.zip + pip3 install https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.3.0_fork_2023-12-19.zip pip3 install -r ./.github/workflows/ci_test_requirements.txt # Install Python2 stuff curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py sudo apt install python2 python2 get-pip.py - pip2 --no-python-version-warning install https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.3.0_fork_fe39273cc5020_new.zip + pip2 --no-python-version-warning install https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.3.0_fork_2023-12-19.zip pip2 --no-python-version-warning install -r ./.github/workflows/ci_test_requirements.txt - name: Run tests (Python 3) @@ -164,7 +164,7 @@ jobs: # Install Python2 stuff curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py python2 get-pip.py - pip2 --no-python-version-warning install -r ./.github/workflows/ci_test_requirements.txt + python2 -m pip --no-python-version-warning install -r ./.github/workflows/ci_test_requirements.txt - name: Run tests (Python 3) run: | diff --git a/bundle_calibre_plugin.sh b/bundle_calibre_plugin.sh index 8df926c..fcb5919 100755 --- a/bundle_calibre_plugin.sh +++ b/bundle_calibre_plugin.sh @@ -45,7 +45,7 @@ rm -r __pycache__ rm *.pyc # Set module ID. This needs to be changed if any of the module ZIPs change. -echo -n "2022-07-31-01" > module_id.txt +echo -n "2023-12-19-01" > module_id.txt # Copy LICENSE and README.md so it'll be included in the ZIP. cp ../LICENSE LICENSE diff --git a/package_modules.sh b/package_modules.sh index 636e130..3a6c853 100755 --- a/package_modules.sh +++ b/package_modules.sh @@ -13,7 +13,7 @@ pushd calibre-plugin # See https://github.com/wbond/oscrypto/pull/61 for more information. wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/asn1crypto_1.5.1.zip -O asn1crypto.zip -wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.3.0_fork_fe39273cc5020_new.zip -O oscrypto.zip +wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.3.0_fork_2023-12-19.zip -O oscrypto.zip popd