Just a diff view

.github/workflows/pythonpublish.yml

@@ -1,26 +1,48 @@
-name: Upload Python Package
+name: Publish Python Package
 
 on:
+  workflow_dispatch: {}
   release:
-    types: [created]
+    types: [published]
 
 jobs:
-  deploy:
+  build:
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'release' }}
+    name: Build release artifacts
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.8'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install --upgrade build twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python -m build
-        python -m twine upload dist/*
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - name: Install build tool
+        run: python3 -m pip install --upgrade build
+      - name: Build wheel & sdist
+        run: python3 -m build
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-files
+          path: dist/
+
+  test-publish:
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: build
+    uses: ./.github/workflows/upload_to_repository.yml
+    with:
+      repository-url: https://test.pypi.org/legacy/
+    secrets:
+      pypi-token: ${{ secrets.TEST_PYPI_API_TOKEN }}
+
+  publish:
+    if: ${{ github.event_name == 'release' }}
+    needs: build
+    uses: ./.github/workflows/upload_to_repository.yml
+    with:
+      repository-url: https://upload.pypi.org/legacy/
+    secrets:
+      pypi-token: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/pythontest.yaml

@@ -11,46 +11,41 @@ on:
      - '**'
     paths:
      - 'qupulse/**y'
-     - 'qctoolkit/**'
      - 'tests/**'
      - 'setup.*'
      - 'pyproject.toml'
+     - '.github/workflows/*'
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
-        time-type: ["fractions", "gmpy2"]
+        python-version: ["3.10", "3.11", "3.12"]
+        numpy-version: [">=1.24,<2.0", ">=2.0"]
     env:
       INSTALL_EXTRAS: tests,plotting,zurich-instruments,tektronix,tabor-instruments
 
 
     steps:
-    - name: Prepare gmpy2 build dependencies
-      if: ${{ matrix.time-type }} == 'gmpy2'
-      run: |
-        sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev
-        echo "INSTALL_EXTRAS=${{ env.INSTALL_EXTRAS }},Faster-fractions" >> $GITHUB_ENV
-
     - name: Checkout repository
       uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        # supported since 2.3
         cache: pip
-        cache-dependency-path: setup.cfg
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install coverage coveralls
 
+    - name: Install numpy ${{ matrix.numpy-version }}
+      run: python -m pip install "numpy${{ matrix.numpy-version }}"
+
     - name: Install package
       run: |
         python -m pip install .[${{ env.INSTALL_EXTRAS }}]
@@ -59,18 +54,31 @@ jobs:
       run: |
         coverage run -m pytest --junit-xml pytest.xml
 
+    - name: Generate valid name
+      run: |
+        numpy_version="${{ matrix.numpy-version }}"
+        if [[ $numpy_version == *"<2"* ]]; then
+            numpy_version="1"
+        else
+            numpy_version="2"
+        fi
+        MATRIX_NAME="python-${{ matrix.python-version }}-numpy-"$numpy_version
+        echo "MATRIX_NAME=$MATRIX_NAME" >> $GITHUB_ENV
+
     - name: Upload coverage data to coveralls.io
       run: coveralls --service=github
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        COVERALLS_FLAG_NAME: python-${{ matrix.python-version }}-${{ matrix.time-type }}
+        COVERALLS_FLAG_NAME: ${{ env.MATRIX_NAME }}
         COVERALLS_PARALLEL: true
+      # this step can fail
+      continue-on-error: true
 
     - name: Upload Test Results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: Unit Test Results ( ${{ matrix.python-version }}-${{ matrix.time-type }} )
+        name: Unit Test Results ( ${{ env.MATRIX_NAME }} )
         path: |
           pytest.xml
 
@@ -86,13 +94,15 @@ jobs:
         coveralls --service=github --finish
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # this step can fail
+      continue-on-error: true
 
   event_file:
     name: "Event File"
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Event File
         path: ${{ github.event_path }}

.github/workflows/upload_to_repository.yml

@@ -0,0 +1,31 @@
+name: Upload artifacts
+
+on:
+  workflow_call:
+    inputs:
+      repository-url:
+        required: true
+        type: string
+    secrets:
+      pypi-token:
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist-files
+          path: dist/
+      - name: Install Twine
+        run: python3 -m pip install --upgrade twine
+      - name: Upload
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.pypi-token }}
+        run: python -m twine upload --repository-url ${{ inputs.repository-url }} dist/*

.gitignore

@@ -9,8 +9,8 @@ dist/*
 doc/source/examples/.ipynb_checkpoints/*
 **.asv
 *.orig
-MATLAB/+qc/personalPaths.mat
 /doc/source/_autosummary/*
 .idea/
 .mypy_cache/*
 tests/hardware/WX2184C.exe
+.vscode/*

.zenodo.json

@@ -0,0 +1,74 @@
+{
+    "creators": [
+        {
+            "orcid": "0000-0002-9399-1055",
+            "affiliation": "RWTH Aachen University",
+            "name": "Humpohl, Simon"
+        },
+        {
+            "orcid": "0000-0001-8678-961X",
+            "affiliation": "RWTH Aachen University",
+            "name": "Prediger, Lukas"
+        },
+        {
+            "orcid": "0000-0002-8227-4018",
+            "affiliation": "RWTH Aachen University",
+            "name": "Cerfontaine, Pascal"
+        },
+        {
+            "affiliation": "Forschungszentrum Jülich",
+            "name": "Papajewski, Benjamin"
+        },
+        {
+            "orcid": "0000-0001-9927-3102",
+            "affiliation": "RWTH Aachen University",
+            "name": "Bethke, Patrick"
+        },
+        {
+            "orcid": "0000-0003-2057-9913",
+            "affiliation": "Forschungszentrum Jülich",
+            "name": "Lankes, Lukas"
+        },
+        {
+            "orcid": "0009-0006-9702-2979",
+            "affiliation": "Forschungszentrum Jülich",
+            "name": "Willmes, Alexander"
+        },
+        {
+            "orcid": "0009-0000-3779-4711",
+            "affiliation": "Forschungszentrum Jülich",
+            "name": "Kammerloher, Eugen"
+        }
+    ],
+
+    "contributors": [
+        {
+            "orcid": "0000-0001-7018-1124",
+            "affiliation": "Netherlands Organisation for Applied Scientific Research TNO",
+            "name": "Eendebak, Pieter Thijs"
+        },
+        {
+            "name": "Kreutz, Maike",
+            "affiliation": "RWTH Aachen University"
+        },
+        {
+            "name": "Xue, Ran",
+            "affiliation": "RWTH Aachen University",
+            "orcid": "0000-0002-2009-6279"
+        }
+    ],
+
+    "related_identifiers": [
+        {
+            "identifier": "2128/24264",
+            "relation": "isDocumentedBy",
+            "resource_type": "publication-thesis"
+        }
+    ],
+
+    "license": "GPL-3.0-or-later",
+
+    "title": "qupulse: A Quantum compUting PULse parametrization and SEquencing framework",
+
+    "keywords": ["quantum computing", "control pulse"]
+}