From 64aaca3fbea10bd6e16534df4d4409e623b73abd Mon Sep 17 00:00:00 2001 From: Florian Bach Date: Tue, 19 Dec 2023 06:45:01 +0100 Subject: [PATCH] Update oscrypto again --- .github/workflows/ci_test_requirements.txt | 3 +++ .github/workflows/main.yml | 8 ++++---- bundle_calibre_plugin.sh | 2 +- package_modules.sh | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_test_requirements.txt b/.github/workflows/ci_test_requirements.txt index 1a1dcda..169ae02 100644 --- a/.github/workflows/ci_test_requirements.txt +++ b/.github/workflows/ci_test_requirements.txt @@ -9,3 +9,6 @@ oscrypto # Require cryptography >= 3.1 because in 3.0 and below, the backend param in load_key_and_certificates was still required. cryptography==3.1 ; python_version < '3.0' cryptography>=3.1 ; python_version >= '3.0' + +# Bugfix for MacOS Python2: +python-dateutil>=2.7.0 ; python_version < '3.0' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75f72f8..92ff54f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"] + python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] # 3.13-dev currently broken due to lxml steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -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