Skip to content

Dummy merge #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 74 commits into
base: feat/linspace_measurements_mergedmain
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
306d4dc
Change license to GPL
shumpohl May 30, 2022
2282171
Add SPDX license headers and move license file
shumpohl May 27, 2024
4ebd314
Add section about licensing in README
shumpohl May 27, 2024
ea88576
Move pytest config to pyproject and use default path
shumpohl Jun 3, 2024
2342c57
Only trigger import hacking on manual request
shumpohl Jun 4, 2024
362edb3
Merge pull request #834 from qutech/fix/timetype_tests
Jun 4, 2024
5b71855
Merge pull request #832 from qutech/fix/testpaths
Jun 4, 2024
4f4721d
Make Waveform comparison __slots__based
shumpohl Jun 3, 2024
839e114
Re-introduce compare_key with deprecation warning
shumpohl Jun 4, 2024
3d1ebbb
Include duration in Waveform comparison
shumpohl Jun 4, 2024
3a1042d
Exclude cached attributes from TransformingWaveform comparison
shumpohl Jun 4, 2024
2c686e6
Update tests to reflect compare_key deprecation
shumpohl Jun 4, 2024
216da48
Missing waveform related test
shumpohl Jun 4, 2024
9f38a39
Depreacte Comparable and cleanup some imports
shumpohl Jun 4, 2024
f78b832
Fix missing return value in AWG.compare_key
shumpohl Jun 4, 2024
fc0e5e7
Unify transformation comparison implementations
shumpohl Jun 4, 2024
24eec09
Merge pull request #825 from qutech/gpl
Jun 5, 2024
b346ad7
Add zenodo metadata
shumpohl May 7, 2024
9efd965
Merge pull request #821 from qutech/dev/zenodo
Jun 5, 2024
f9ed9ff
Do not execute hardware dependent notebook when building docs
shumpohl Jun 10, 2024
787f2bc
Include LoopBuilder explicitly in public interface
shumpohl Jun 10, 2024
3be8559
Fix several docstrings and improve program concept documentation
shumpohl Jun 10, 2024
bd99d28
Fix license classifier
shumpohl Jun 10, 2024
8ed4acf
Merge pull request #840 from qutech/doc/exclude_unevaluatable_notebook
Jun 10, 2024
0919b94
Merge pull request #842 from qutech/fix/classifier
Jun 10, 2024
f154f1b
Make gmpy2 a hard dependency
shumpohl Jun 17, 2024
850786e
Delete .travis.yml
Jun 17, 2024
a438f01
Merge pull request #846 from qutech/fix/remove_travis_file
Jun 17, 2024
f732295
Merge pull request #844 from qutech/doc/program_linspace
Jun 17, 2024
3968eb5
Add news fragment
shumpohl Jun 17, 2024
1c360b7
Merge pull request #847 from qutech/issues/845_gmpy2_requirement
Jun 17, 2024
5cb794e
Migrate to hatch
shumpohl Jun 17, 2024
a1f834d
Switch to hatch as unified documentation build interface
shumpohl Jun 10, 2024
2e58359
Make build path even more confused
shumpohl Jun 10, 2024
b9d726b
Use default requirements to build docs
shumpohl Jun 10, 2024
147676d
Add towncrier integration and update README accordingly
shumpohl Jun 17, 2024
cc4e7b8
Update python setup
shumpohl Jun 17, 2024
e6f738a
Merge pull request #836 from qutech/dev/deprecate_comparable
Jun 17, 2024
287e03f
Merge pull request #843 from qutech/dev/hatch
Jun 20, 2024
c74c871
Properly include ZHINST example
shumpohl Jun 20, 2024
a229bf2
Specify expression path
shumpohl Jun 20, 2024
a707b90
Include zhinst as dependency for documentation
shumpohl Jun 20, 2024
168f0a6
Include docs:clean command
shumpohl Jun 20, 2024
3294b64
Remove outdated sentence in documentation
shumpohl Jun 20, 2024
f905f12
Merge pull request #850 from qutech/doc/polish_2024_06
Jun 20, 2024
5a724a9
Remove "unexpected indentation"
shumpohl Jun 20, 2024
c00dd7b
Push minimal supported python version
shumpohl Jun 20, 2024
21cd24b
Allow gmpy2 release candidate installation for python 3.12
shumpohl Jun 20, 2024
e502116
Do not used removed assertEquals alias
shumpohl Jun 20, 2024
bce97bc
Remove dead custom frozendict implementations
shumpohl Jun 20, 2024
414d913
Merge pull request #851 from qutech/dev/python_3_10
Jun 20, 2024
c73d943
Merge pull request #852 from qutech/doc/polish_2024_06
Jun 20, 2024
3ad03a6
Merge pull request #854 from qutech/issues/853_frozendict
Jun 20, 2024
ed91fb1
fix jump back in linspace
Nomos11 Jun 20, 2024
06da4f7
Add numpy to test matrix
shumpohl Jun 21, 2024
ed23e61
Execute tests on workflow changes
shumpohl Jun 21, 2024
83a6421
Merge pull request #859 from qutech/issues/856_numpy_test_matrix
Jun 21, 2024
d70643b
Add linspace VM
shumpohl Jun 21, 2024
025ba8a
Add test that fails due to known bug
shumpohl Jun 21, 2024
10f13b1
Merge branch 'dev/linspace_jumpback_fix' into issues/860_linspace_vm
shumpohl Jun 21, 2024
6aa2e03
Fix VM loop count handling
shumpohl Jun 21, 2024
e598e8c
Add working VM tests
shumpohl Jun 21, 2024
e2801ff
Add singlet reload test
shumpohl Jun 21, 2024
c6b0ff4
Merge pull request #861 from qutech/issues/860_linspace_vm
Jun 21, 2024
62c61f5
Improve arithmetic atomic pt warning level
shumpohl Jul 1, 2024
418e0cd
Add clean notebook command
shumpohl Jul 1, 2024
3e4cee6
Add failing test
shumpohl Jul 1, 2024
2fd223e
Add time_reversed to LoopBuilder
shumpohl Jul 1, 2024
777acaa
Merge pull request #867 from qutech/issues/865_time_reversal_loop
Jul 1, 2024
4e19373
Merge branch 'master' into doc/fix_formatting
shumpohl Jul 1, 2024
54a7921
Clean execution state of nearly all notebooks
shumpohl Jul 1, 2024
0ecb08b
Update documentation and make all hardware dependent notebooks start …
shumpohl Jul 1, 2024
220c215
Merge pull request #868 from qutech/doc/fix_formatting
Jul 1, 2024
fb33068
'return' in SimpleExpression.__rsub__
Nomos11 Jul 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .github/workflows/pythontest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,38 @@ on:
- 'tests/**'
- 'setup.*'
- 'pyproject.toml'
- '.github/workflows/*'

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]
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: Add gmpy extra feature
if: ${{ matrix.time-type }} == 'gmpy2'
run: |
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 }}]
Expand Down
40 changes: 0 additions & 40 deletions .travis.yml

This file was deleted.

74 changes: 74 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -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"]
}
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

Loading
Loading