From 429a86aee68b7991d5e5890ce2f3c5264c278142 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Tue, 25 Nov 2025 10:08:08 +0100 Subject: [PATCH 1/4] Hotfix due to breaking changes netqasm * Change gitlab CI docker image to a newer image with ubuntu 24 and python3.12 * Pin Netqasm to 2.0.0 * Bump mimimum netsquid to 1.1.8 * Bump mimimum python to 3.10 --- .gitlab-ci.yml | 4 +++- CHANGELOG.md | 6 ++++++ setup.cfg | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a1170d6..1d80138e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: adahlberg/nlblueprintci:19.04 +image: mvanhooft/squidasm_ci:24.04 .only_mr: &only_mr only: @@ -14,6 +14,8 @@ image: adahlberg/nlblueprintci:19.04 - echo "$SSH_PRIVATE_KEY" | ssh-add - - echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts + ## Start using the virtual environment + - source venv/bin/activate ## Install netqasm - echo $CI_COMMIT_REF_NAME - echo $CI_COMMIT_BRANCH diff --git a/CHANGELOG.md b/CHANGELOG.md index a6d8933b..55faaeff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +2025-11-24 (0.13.6) +-------------------- +- Pin netqasm to 2.0.0 due to breaking changes in 2.1.0 +- Bump minimum netsquid version to 1.1.8 to resolve compatibility issues where older netsquid versions fail with newer scipy versions +- Bump minimum Python version to 3.10 as required netsquid 1.1.8 dependency is not available for Python 3.9 and earlier + 2025-05-13 (0.13.5) ------------------- - Fix compatibility issue in MagicNetworkLayerProtocol due to changes in netsquid-magic diff --git a/setup.cfg b/setup.cfg index 1d037fbf..2cd386ee 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ long_description_content_type = text/x-rst license = MIT home_page = https://github.com/QuTech-Delft/squidasm url = https://github.com/QuTech-Delft/squidasm -python_requires = >=3.7 +python_requires = >=3.10 [options] packages = squidasm @@ -20,10 +20,10 @@ install_requires = scipy >=1.8, <2.0 pydantic >=1.8.2, < 3.0 pydynaa >=0.3, <2.0 - netsquid >=1.1.2, <2.0 + netsquid >=1.1.8, <2.0 netsquid-magic >= 16.0.0, <17.0.0 bitarray >=2.8.0, <3.0.0 - netqasm >=0.11.2 + netqasm >=1.0.0, <=2.0.0 pytest >=7.1, <8.0 [options.extras_require] From 90ac48251a7626e9ddb2a653f7fcc8dfcb80df9f Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Tue, 25 Nov 2025 10:14:01 +0100 Subject: [PATCH 2/4] Change make install to make-install-dev --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d80138e..a926cd69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ image: mvanhooft/squidasm_ci:24.04 - cd netqasm - make install - cd .. - - make install + - make install-dev stages: - lint From 2f344129ae4841011b7a72c87a9eae3d43fdfe13 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Tue, 25 Nov 2025 11:24:50 +0100 Subject: [PATCH 3/4] * Remove gitlab ci file * Increase python version --- .github/workflows/actions.yaml | 6 +-- .gitlab-ci.yml | 70 ---------------------------------- 2 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index ff60c86b..0e45feeb 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@master with: - python-version: 3.8 + python-version: 3.10 - env: NETSQUIDPYPI_USER: ${{ secrets.NETSQUIDPYPI_USER }} NETSQUIDPYPI_PWD: ${{ secrets.NETSQUIDPYPI_PWD }} @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@master with: - python-version: 3.8 + python-version: 3.10 - env: NETSQUIDPYPI_USER: ${{ secrets.NETSQUIDPYPI_USER }} NETSQUIDPYPI_PWD: ${{ secrets.NETSQUIDPYPI_PWD }} @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@master with: - python-version: 3.8 + python-version: 3.10 - env: NETSQUIDPYPI_USER: ${{ secrets.NETSQUIDPYPI_USER }} NETSQUIDPYPI_PWD: ${{ secrets.NETSQUIDPYPI_PWD }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a926cd69..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,70 +0,0 @@ -image: mvanhooft/squidasm_ci:24.04 - -.only_mr: &only_mr - only: - - master - - merge_requests - -.install: &install - before_script: - ## Add private key to server access - - eval $(ssh-agent -s) - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - echo "$SSH_PRIVATE_KEY" | ssh-add - - - echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - ## Start using the virtual environment - - source venv/bin/activate - ## Install netqasm - - echo $CI_COMMIT_REF_NAME - - echo $CI_COMMIT_BRANCH - # Use master if merging to master otherwise develop - # if not merging then use master if on master otherwise develop - - BRANCH="$(if [ "$CI_COMMIT_BRANCH" == "" ]; then if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then echo "master"; else echo "develop"; fi; else if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then echo "master"; else echo "develop"; fi; fi)" - - echo $BRANCH - - git clone git@gitlab.tudelft.nl:qinc-wehner/netqasm/netqasm.git -b $BRANCH - - cd netqasm - - make install - - cd .. - - make install-dev - -stages: - - lint - - tests - - examples - - deploy - -lint: - <<: *install - stage: lint - script: make lint - <<: *only_mr - -tests: - <<: *install - stage: tests - script: make tests - <<: *only_mr - -sdk-tests: - <<: *install - variables: - NETQASM_SIMULATOR: netsquid - stage: tests - script: make -C netqasm external-tests - <<: *only_mr - -examples: - <<: *install - stage: examples - script: make examples - <<: *only_mr - -sdk-examples: - <<: *install - variables: - NETQASM_SIMULATOR: netsquid - stage: examples - script: make -C netqasm external-examples - <<: *only_mr From 00ea3f447c5be1bc7a4a03231e930e43ca67ce18 Mon Sep 17 00:00:00 2001 From: mvanhooft Date: Tue, 25 Nov 2025 11:28:44 +0100 Subject: [PATCH 4/4] Increase python version --- .github/workflows/actions.yaml | 6 +++--- .github/workflows/publish.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index 0e45feeb..ccc3b041 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@master with: - python-version: 3.10 + python-version: 3.10.19 - env: NETSQUIDPYPI_USER: ${{ secrets.NETSQUIDPYPI_USER }} NETSQUIDPYPI_PWD: ${{ secrets.NETSQUIDPYPI_PWD }} @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@master with: - python-version: 3.10 + python-version: 3.10.19 - env: NETSQUIDPYPI_USER: ${{ secrets.NETSQUIDPYPI_USER }} NETSQUIDPYPI_PWD: ${{ secrets.NETSQUIDPYPI_PWD }} @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@master with: - python-version: 3.10 + python-version: 3.10.19 - env: NETSQUIDPYPI_USER: ${{ secrets.NETSQUIDPYPI_USER }} NETSQUIDPYPI_PWD: ${{ secrets.NETSQUIDPYPI_PWD }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5ebca8b7..68e8be0e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.9 + - name: Set up Python 3.10.19 uses: actions/setup-python@v1 with: - python-version: 3.9 + python-version: 3.10.19 - name: Install pypa/build run: >- python -m