Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
cd38ee9
Change PySide2 imports to PySide6 imports
obrienpja Aug 22, 2022
2d85448
Update QT_API to PySide6 and update mpl backend
obrienpja Sep 25, 2022
8f1263a
Merge branch 'main' into pyside6-v2
obrienpja Jan 25, 2023
a00ea96
Install libegl in ubuntu environment
obrienpja Jan 26, 2023
e9defda
Comment out mpl.use
obrienpja Jan 26, 2023
d0bcb56
Yapf format main_window.py
obrienpja Jan 31, 2023
2810eb3
Merge branch 'pyside6-v2' of github.com:Qiskit/qiskit-metal into pysi…
obrienpja Jan 31, 2023
61a00c2
Remove sleeps from GUI
obrienpja Feb 1, 2023
fb66b0a
Add qdarkstyle to dependencies
obrienpja Feb 1, 2023
cedd497
Fix version of libegl1 to 22.0.1
obrienpja Feb 6, 2023
c4dd5bd
Fix version number for libegl1
obrienpja Feb 6, 2023
08bf56d
Try installing libegl1 version 22.0.1-1ubuntu2
obrienpja Feb 6, 2023
eb5b94a
Fix libegl1 version to 1.4.0-1
obrienpja Feb 6, 2023
94f791c
Install libegl-mesa0 version 22.0.1-1ubuntu2
obrienpja Feb 6, 2023
35f31ea
Run sudo apt update and remove libegl1 dep
obrienpja Feb 6, 2023
0cfd93a
Change some Qt6 class paths
obrienpja Feb 7, 2023
b6654b4
Merge branch 'main' into pyside6-v2
priti-ashvin-shah-ibm Feb 14, 2023
65d34d7
fix: changed env and qwidget for working gui
shanto268 Nov 18, 2024
a72617f
fix: changed QWidget_PlaceholderText and environment files
shanto268 Nov 18, 2024
352415c
Merge branch 'pyside6-port'
shanto268 Nov 18, 2024
03fe275
docs: got rid of log files
shanto268 Nov 18, 2024
31b612e
fix: changed requirements + fixed the Paths
shanto268 Nov 18, 2024
deb7813
docs: added pyyaml and cython to reqs
shanto268 Nov 18, 2024
566918c
docs: fixing the requirements
shanto268 Nov 18, 2024
a87652e
docs: Fix linting issues to satisfy CI checks
shanto268 Nov 18, 2024
b9ad48c
docs: Update upload-artifact to v3 in docs workflow
shanto268 Nov 18, 2024
06b5b2e
fix: added missing QFileSystemModel import
shanto268 Nov 19, 2024
492268e
Merge branch 'main' into main
zlatko-minev Dec 16, 2024
6e48123
Merge branch 'main' into main
zlatko-minev Dec 31, 2024
2ce4996
Bumping Qiskit Metal version
zlatko-minev Dec 31, 2024
7714dee
Added mermaid diagram and overview
zlatko-minev Dec 31, 2024
54c1685
Update README_ARCH.md: Fixed meramid theme
zlatko-minev Dec 31, 2024
6545951
Update README.md
zlatko-minev Dec 31, 2024
e481012
Update README.md
zlatko-minev Dec 31, 2024
fb8081b
Update README.md
zlatko-minev Dec 31, 2024
d76f76c
Update README.md
zlatko-minev Dec 31, 2024
ea3e2e4
fix mermaid js
zlatko-minev Dec 31, 2024
0f04a1a
Merge branch 'main' into main
zlatko-minev Jan 20, 2025
df2347f
Clean up readmes
zlatko-minev Jan 20, 2025
444b4ca
pylint
zlatko-minev Jan 26, 2025
9589b47
contributions update
zlatko-minev Jan 26, 2025
cf577a5
GUI Styles minot rupdate and install
zlatko-minev Jan 26, 2025
6b7b258
MPL fix on issue of aspect ratio
zlatko-minev Jan 26, 2025
626909f
### Gui
zlatko-minev Jan 26, 2025
f10a121
Changelog
zlatko-minev Jan 26, 2025
00958d5
gui emitreset fix
zlatko-minev Jan 26, 2025
8f129bb
cleanup lint for file skeleton render
zlatko-minev Jan 26, 2025
7c161a4
Fixedaspect ratio and cleanuo
zlatko-minev Jan 26, 2025
36c7b1d
Requirements testuing updating
zlatko-minev Jan 26, 2025
f7ec17b
Changelog
zlatko-minev Jan 26, 2025
2c348ff
GDS RENDERED with GDSTK
zlatko-minev Jan 26, 2025
71a22c2
GSTK make cheese
zlatko-minev Jan 26, 2025
24b34ac
Todo for v0.5
zlatko-minev Jan 26, 2025
127656d
Fix GDS renderer
PositroniumJS May 1, 2025
85fa528
Merge pull request #1 from PositroniumJS/pr-1002
shanto268 May 5, 2025
da9a318
Remove deprecated method
PositroniumJS May 2, 2025
96ec6af
Fix nitpicks
PositroniumJS May 2, 2025
3d33d09
Port cheesing to GDSTK and remove remaining occurences of GDSPY. Fix …
PositroniumJS May 9, 2025
9b8c04a
Fix failing test after GDS renderer update.
abhishekchak52 May 17, 2025
4107387
Merge pull request #3 from abhishekchak52/main
shanto268 Jun 17, 2025
ca81918
Merge pull request #2 from PositroniumJS/pr-1002
shanto268 Jun 24, 2025
03dbb53
python and pyaedt update
PositroniumJS Sep 17, 2025
b12d66a
Fix typos
PositroniumJS Sep 17, 2025
acf19f0
Merge pull request #4 from PositroniumJS/main-shanto
shanto268 Sep 20, 2025
8aea74d
Lint
PositroniumJS Sep 20, 2025
bbc7d29
Merge pull request #5 from PositroniumJS/main-shanto
shanto268 Sep 20, 2025
fa54459
Fix gds not rendering properly for large structures with fillet
PositroniumJS Oct 4, 2025
558f4d3
Fix the return type for the holes in the gds generation
PositroniumJS Oct 4, 2025
1dc49a1
Update workflows
PositroniumJS Oct 4, 2025
c201554
Fix some docs warnings
PositroniumJS Oct 4, 2025
82bc3f5
Merge pull request #7 from PositroniumJS/main-shanto
shanto268 Oct 4, 2025
b378250
Missing tolerance parameter for `gdstk.FlexPath`
PositroniumJS Oct 8, 2025
87952a9
Pi phase change in Hcpb evec test
PositroniumJS Oct 8, 2025
59985e9
Merge pull request #8 from PositroniumJS/main-shanto
shanto268 Oct 8, 2025
e923a1a
Remove deprecated `imp` module
PositroniumJS Oct 8, 2025
14b111e
Bump pyaedt version to fix import issues on Mac
PositroniumJS Oct 9, 2025
89b71ee
Remove useless descartes dependancy
PositroniumJS Oct 9, 2025
0841388
Make test_analysis_transmon_charge_basis_evec_k robust to sign flip
PositroniumJS Oct 9, 2025
b94664b
Apply the fix of #973 instead to correct the gds export of structures…
PositroniumJS Oct 10, 2025
216a6c9
Merge pull request #9 from PositroniumJS/main-shanto
shanto268 Oct 21, 2025
5d88de2
Restore dedicated cell and layer for positive mask ground plane
SamWolski Oct 23, 2025
d3d7d5f
Merge pull request #10 from SamWolski/main
shanto268 Oct 27, 2025
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
15 changes: 8 additions & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ on:

jobs:
deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: "3.9"
python-version: "3.12"
cache: "pip"
- name: Install dependencies
run: |
python -m pip install --upgrade pip==23.0
pip install -U tox==4.11.0 setuptools==67.3.1 virtualenv==20.24.3 wheel==0.38.4
python -m pip install --upgrade pip==25.2
pip install -U tox==4.30.3 setuptools==80.9.0 virtualenv==20.34.0 wheel==0.45.1
sudo apt update
sudo apt install graphviz=2.42.2-6 pandoc=2.9.2.1-3ubuntu2 qtbase5-dev=5.15.3+dfsg-2ubuntu0.2 qt5-qmake=5.15.3+dfsg-2ubuntu0.2
sudo apt install graphviz=2.42.2-9ubuntu0.1 pandoc=3.1.3+ds-2 qtbase5-dev=5.15.13+dfsg-1ubuntu1 qt5-qmake=5.15.13+dfsg-1ubuntu1
- name: Build docs
run: tox -edocs -- -j auto
- name: Bypass Jekyll Processing # Necessary for setting the correct css path
Expand Down
113 changes: 37 additions & 76 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,147 +6,108 @@ on:
pull_request:
branches: [main, "stable/*"]
jobs:
# NOTE: The ubuntu-22.04 and macos-latest tests have been separated out because ubuntu
# NOTE: The ubuntu-24.04 and macos-latest tests have been separated out because ubuntu
# requires installing some additional libraries (libglu1-mesa) for Gmsh to run. Please
# consider this aspect before combining the tests for both the OS platforms.
ubuntu-tests:
# Name the Job
name: tests-python${{ matrix.python-version }}-ubuntu-latest
# Set the type of machine to run on
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
# Set matrix for runs-on
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.11", "3.12"]
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v5
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Pip cache
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ubuntu-latest-${{ matrix.python-version }}-pip-tests-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
restore-keys: |
ubuntu-latest-${{ matrix.python-version }}-pip-tests-
ubuntu-latest-${{ matrix.python-version }}-pip-
ubuntu-latest-${{ matrix.python-version }}
cache: "pip"
- name: Install Deps
run: |
python -m pip install -U tox==4.11.0 setuptools==67.3.1 virtualenv==20.24.3 wheel==0.38.4
sudo apt install libglu1-mesa=9.0.2-1 libglu1-mesa-dev=9.0.2-1
python -m pip install -U tox setuptools virtualenv wheel
sudo apt update
sudo apt install libglu1-mesa libglu1-mesa-dev libegl1-mesa-dev
- name: Install and Run Tests
run: tox -e py
macos-tests:
# Name the Job
name: tests-python${{ matrix.python-version }}-macOS-latest
# Set the type of machine to run on
runs-on: macos-12
runs-on: macos-15
# Set matrix for runs-on
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.11", "3.12"]
steps:
- name: Chekout code
uses: actions/checkout@v3
uses: actions/checkout@v5
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Pip cache
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: macOS-latest-${{ matrix.python-version }}-pip-tests-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
restore-keys: |
macOS-latest-${{ matrix.python-version }}-pip-tests-
macOS-latest-${{ matrix.python-version }}-pip-
macOS-latest-${{ matrix.python-version }}
cache: "pip"
- name: Install Deps
run: python -m pip install -U tox==4.11.0 setuptools==67.3.1 virtualenv==20.24.3 wheel==0.38.4
run: python -m pip install -U tox setuptools virtualenv wheel
- name: Install and Run Tests
run: tox -e py
windows-tests:
name: tests-python${{ matrix.python-version }}-windows
runs-on: windows-2022
runs-on: windows-2025
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.11", "3.12"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Pip cache
uses: actions/cache@v3
with:
path: ~\AppData\Local\pip\Cache
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-tests-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version }}-pip-tests-
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}-
cache: "pip"
- name: Install deps
run: |
python -m pip install -U tox==4.11.0 cvxopt==1.3.0 setuptools==67.3.1 virtualenv==20.24.3 wheel==0.38.4
python -m pip install -U tox cvxopt setuptools virtualenv wheel
shell: pwsh
- name: Install and Run Tests
run: tox --sitepackages -e py
shell: bash -l {0}
lint:
name: lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Pip cache
uses: actions/cache@v3
- uses: actions/checkout@v5
- name: Set up Python 3.12
uses: actions/setup-python@v6
with:
path: ~/.cache/pip
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-lint-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python-version }}-pip-lint-
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}-
python-version: 3.12
cache: "pip"
- name: Install Deps
run: python -m pip install -U tox==4.11.0
run: python -m pip install -U tox
- name: Run lint
run: tox -elint
docs:
name: docs
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Pip cache
uses: actions/cache@v3
- name: Set up Python 3.12
uses: actions/setup-python@v6
with:
path: ~/.cache/pip
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-docs-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-docs-
${{ runner.os }}-pip-
${{ runner.os }}-
python-version: 3.12
cache: "pip"
- name: Install Deps
run: |
python -m pip install -U tox==4.11.0
python -m pip install -U tox==4.30.3
sudo apt update
sudo apt install -y graphviz=2.42.2-6 pandoc=2.9.2.1-3ubuntu2 qtbase5-dev=5.15.3+dfsg-2ubuntu0.2 qt5-qmake=5.15.3+dfsg-2ubuntu0.2
sudo apt install -y graphviz=2.42.2-9ubuntu0.1 pandoc=3.1.3+ds-2 qtbase5-dev=5.15.13+dfsg-1ubuntu1 qt5-qmake=5.15.13+dfsg-1ubuntu1
- name: Build Docs
run: tox -edocs
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: html_docs
path: docs/_build/html
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ on:
jobs:
wheel-build:
name: Build and Publish Release Artifacts
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
name: Install Python
with:
python-version: "3.10"
python-version: "3.12"
- name: Install Deps
run: pip install -U twine==4.0.2 wheel==0.38.4
run: pip install -U twine==6.2.0 wheel==0.45.1
- name: Build Artifacts
run: |
python setup.py sdist
python setup.py bdist_wheel
shell: bash
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
path: ./dist/qiskit*
- name: Publish to PyPi
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ instance/
# User Folders:
.scrapy
_sandbox_/
_debug/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_debug/

qiskit_metal/qlibrary/user_components/*
!qiskit_metal/qlibrary/user_components/__init__.py
!qiskit_metal/qlibrary/user_components/my_qcomponent.py
Expand Down Expand Up @@ -92,6 +93,7 @@ celerybeat-schedule
# virtualenv
.venv
venv/
venvz/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
venvz/
venvz/

ENV/

# Spyder project settings
Expand Down
18 changes: 9 additions & 9 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code.
extension-pkg-whitelist=PySide2
extension-pkg-whitelist=PySide6,gdstk

# Add files or directories to the blacklist. They should be base names, not
# paths.
Expand Down Expand Up @@ -91,7 +91,7 @@ disable=apply-builtin,
        dict-values-not-iterating,
        dict-view-method,
        div-method,
        eq-without-hash,
;         eq-without-hash,
        exception-escape,
        exception-message-attribute,
        execfile-builtin,
Expand All @@ -108,21 +108,21 @@ disable=apply-builtin,
        intern-builtin,
        invalid-str-codec,
        locally-disabled,
        logging-fstring-interpolation  # fstrings inside logging
logging-fstring-interpolation, # fstrings inside logging
        long-builtin,
        long-suffix,
;         long-suffix,
        map-builtin-not-iterating,
        metaclass-assignment,
missing-module-docstring,
        next-method-called,
        next-method-defined,
        no-absolute-import,
        non-ascii-bytes-literal,
;         non-ascii-bytes-literal,
        nonzero-method,
        oct-method,
        old-division,
        old-ne-operator,
        old-octal-literal,
;         old-ne-operator,
;         old-octal-literal,
        old-raise-syntax,
        parameter-unpacking,
        print-statement,
Expand Down Expand Up @@ -339,8 +339,8 @@ max-module-lines=1000
# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}.
# `trailing-comma` allows a space between comma and closing bracket: (a, ).
# `empty-line` allows space-only lines.
no-space-check=trailing-comma,
dict-separator
; no-space-check=trailing-comma,
; dict-separator

# Allow the body of a class to be on the same line as the declaration if body
# contains single statement.
Expand Down
24 changes: 20 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,38 @@ https://google.github.io/styleguide/pyguide.html) for auto formatting. The custo

#### VSCode Setup

Steps:
1. Install the following extensions: `python` and `yapf` if you have not yet.
2. Add the following workspace setting in the workspace `settings.json`.

If you are using VSCode for your code editor, you can add these settings
to your `settings.json` to enforce your code to our style. Make sure to add PySide2 to the linter:
```
```json
{
"python.linting.pylintEnabled": true,
"python.linting.enabled": true,
"python.linting.pylintArgs": [
"--extension-pkg-whitelist=PySide2"
],
"python.formatting.provider": "yapf",
"editor.formatOnSave": true,
"files.trimTrailingWhitespace": true,
"files.trimFinalNewlines": true
}
```


In newer versions of VS Code:
```json
{
"editor.formatOnSave": true,
"files.trimTrailingWhitespace": true,
"files.trimFinalNewlines": true,
"editor.defaultFormatter": "eeyore.yapf",
"notebook.defaultFormatter": "eeyore.yapf",
"[python]": {
"editor.defaultFormatter": "eeyore.yapf"
}
}
```

### Code Review
Code review is done in the open and open to anyone. While only maintainers have access to merge commits, providing feedback on pull requests is very valuable and helpful. It is also a good mechanism to learn about the code base. You can view a list of all open pull requests to review any open pull requests and provide feedback on it.

Expand Down
Loading