Merge branch 'publish_sphinx_to_gh_pages' of https://github.com/acham…

…ayou/CCF into publish_sphinx_to_gh_pages

.azure-pipelines-templates/install_others.yml

@@ -3,9 +3,8 @@ steps:
       set -ex
       python3.8 -m venv env
       source ./env/bin/activate
-      pip install -r requirements.txt
-      pip install wheel
-      python setup.py bdist_wheel
+      pip install wheel build
+      python -m build --wheel
       WHL=`ls dist/*.whl`
       cp $WHL $(Build.ArtifactStagingDirectory)
       WHL=`basename $WHL`

.github/workflows/pypi.yml

@@ -31,6 +31,5 @@ jobs:
           cd python
           python3 -m venv env
           source ./env/bin/activate
-          pip install -r requirements.txt
           pip install twine
           twine upload -u __token__ -p ${{ secrets.PYPI_TOKEN }} *.whl

.github/workflows/release.yml

@@ -201,9 +201,8 @@ jobs:
           cd python
           python3.8 -m venv env
           source ./env/bin/activate
-          pip install -r requirements.txt
-          pip install wheel
-          python setup.py bdist_wheel
+          pip install wheel build
+          python -m build --wheel
           WHL=`ls dist/*.whl`
           echo "name=$WHL" >> $GITHUB_OUTPUT
         shell: bash

.gitignore

@@ -45,3 +45,4 @@ tests/perf-system/analyzer/*.png
 **/*.ipynb*
 scripts/azure_deployment/.env
 .env
+python/src/ccf/version.py

tests/infra/crypto.py

@@ -70,6 +70,7 @@ def generate_aes_key(key_bits: int) -> bytes:
 
 
 def generate_rsa_keypair(key_size: int) -> Tuple[str, str]:
+    assert key_size >= 2048
     priv = rsa.generate_private_key(
         public_exponent=RECOMMENDED_RSA_PUBLIC_EXPONENT,
         key_size=key_size,

tests/npm_tests.py

@@ -78,7 +78,7 @@ def generate_and_verify_jwk(client):
         assert body["pem"] == pub_pem
 
     # RSA
-    key_sizes = [1024, 2048, 4096]
+    key_sizes = [2048, 4096]
     for key_size in key_sizes:
         priv_pem, pub_pem = infra.crypto.generate_rsa_keypair(key_size)