mirrors/acsm-calibre-plugin
mirrors/acsm-calibre-plugin
1
0
Fork 0
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git synced 2024-12-22 09:19:55 +06:00
Code Issues Projects Releases Wiki Activity

Update oscrypto again

Browse Source
This commit is contained in:
Florian Bach 2023-12-19 06:45:01 +01:00
parent cbc4c7e873
commit 64aaca3fbe
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci_test_requirements.txt vendored
View File

@ -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. # 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'
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'

8
.github/workflows/main.yml vendored
View File

@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: 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: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
@ -118,13 +118,13 @@ jobs:
run: | run: |
# Require cryptography >= 3.1 because in 3.0 and below, the backend param in load_key_and_certificates was still required. # 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 # 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 pip3 install -r ./.github/workflows/ci_test_requirements.txt
# Install Python2 stuff # Install Python2 stuff
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
sudo apt install python2 sudo apt install python2
python2 get-pip.py 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 pip2 --no-python-version-warning install -r ./.github/workflows/ci_test_requirements.txt
- name: Run tests (Python 3) - name: Run tests (Python 3)
@ -164,7 +164,7 @@ jobs:
# Install Python2 stuff # Install Python2 stuff
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
python2 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) - name: Run tests (Python 3)
run: | run: |

2
bundle_calibre_plugin.sh
View File

@ -45,7 +45,7 @@ rm -r __pycache__
rm *.pyc rm *.pyc
# Set module ID. This needs to be changed if any of the module ZIPs change. # 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. # Copy LICENSE and README.md so it'll be included in the ZIP.
cp ../LICENSE LICENSE cp ../LICENSE LICENSE

2
package_modules.sh
View File

@ -13,7 +13,7 @@ pushd calibre-plugin
# See https://github.com/wbond/oscrypto/pull/61 for more information. # 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/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 popd