Skip to content

Commit

Permalink
Merge branch 'main' into renderer-analysis-split
Browse files Browse the repository at this point in the history
  • Loading branch information
marcolincs committed Jun 1, 2021
2 parents 636602a + 2a918a8 commit 9059f04
Show file tree
Hide file tree
Showing 151 changed files with 66,463 additions and 61,753 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7.8'
python-version: '3.7'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
# Set matrix for runs-on
strategy:
matrix:
python-version: [3.7.8]
python-version: [3.7, 3.8]
os: ["macOS-latest", "ubuntu-latest"]
steps:
- name: Chekout code
Expand All @@ -41,7 +41,7 @@ jobs:
# runs-on: windows-latest
# strategy:
# matrix:
# python-version: [3.7.8]
# python-version: [3.7, 3.8]
# steps:
# - uses: actions/checkout@v2
# - name: Set up Python ${{ matrix.python-version }}
Expand All @@ -62,7 +62,7 @@ jobs:
# pip install -U tox cvxopt setuptools virtualenv wheel
# shell: pwsh
# - name: Install and Run Tests
# run: tox --sitepackages -epy
# run: tox --sitepackages -e py
# shell: bash -l {0}
lint:
name: lint
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7.8
python-version: 3.7
- name: Pip cache
uses: actions/cache@v2
with:
Expand All @@ -96,7 +96,7 @@ jobs:
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.7.8
python-version: 3.7
- name: Pip cache
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
# - name: Set up Python 3.7
# uses: actions/setup-python@v2
# with:
# python-version: 3.7.8
# python-version: 3.7
# - name: Pip cache
# uses: actions/cache@v2
# with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/setup-python@v2
name: Install Python
with:
python-version: '3.7.8'
python-version: '3.7'
- name: Install Deps
run: pip install -U twine wheel
- name: Build Artifacts
Expand Down
5 changes: 2 additions & 3 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ ignore=CVS

# Add files or directories matching the regex patterns to the blacklist. The
# regex matches against base names, not paths.
ignore-patterns=
# Auto-generated qt ui files are not to be linted.
ignore-patterns=.*_ui.py$

# Python code to execute, usually for sys.path manipulation such as
# pygtk.require().
Expand Down Expand Up @@ -366,8 +367,6 @@ min-similarity-lines=4


[BASIC]
# Autogenerated qt ui files are not to be linted
--ignore=*_ui.py

# Naming style matching correct argument names.
argument-naming-style=snake_case
Expand Down
29 changes: 29 additions & 0 deletions docs/apidocs/qiskit_metal.analyses.Hcpb_analytic.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@


Hcpb_analytic
===================================

.. currentmodule:: qiskit_metal.analyses

.. autoclass:: Hcpb_analytic
:no-members:
:no-inherited-members:
:no-special-members:








.. rubric:: Methods

.. autosummary::
:toctree: ../stubs/

Hcpb_analytic.evalue_k




10 changes: 10 additions & 0 deletions docs/apidocs/qiskit_metal.analyses.Sweeping.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,22 @@ Sweeping
.. autosummary::
:toctree: ../stubs/

Sweeping.error_check_and_insert_sweep
Sweeping.error_check_render_design_args
Sweeping.error_check_sweep_input
Sweeping.get_quality_factor
Sweeping.get_size_of_matrix
Sweeping.hfss_dm_get_convergence
Sweeping.hfss_em_get_convergence
Sweeping.option_value
Sweeping.parse_text_from_hfss_convergence
Sweeping.populate_dm_all_sweep
Sweeping.populate_q3d_all_sweep
Sweeping.prep_drivenmodal_setup
Sweeping.prep_eigenmode_setup
Sweeping.prep_q3d_setup
Sweeping.sweep_one_option_get_capacitance_matrix
Sweeping.sweep_one_option_get_drivenmodal_solution_data
Sweeping.sweep_one_option_get_eigenmode_solution_data
Sweeping.warning_for_setup

Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.analyses.lumped_capacitive.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ lumped_capacitive
get_C_and_Ic
levels_vs_ng_real_units
load_q3d_capacitance_matrix
lumped_oscillator_from_path
move_index_to
readin_q3d_matrix
readin_q3d_matrix_m
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.Cap3Interdigital.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Cap3Interdigital
.. autosummary::
:toctree: ../stubs/

Cap3Interdigital.TOOLTIP
Cap3Interdigital.class_name
Cap3Interdigital.component_metadata
Cap3Interdigital.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.CapNInterdigital.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CapNInterdigital
.. autosummary::
:toctree: ../stubs/

CapNInterdigital.TOOLTIP
CapNInterdigital.class_name
CapNInterdigital.component_metadata
CapNInterdigital.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.CapNInterdigitalTee.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CapNInterdigitalTee
.. autosummary::
:toctree: ../stubs/

CapNInterdigitalTee.TOOLTIP
CapNInterdigitalTee.class_name
CapNInterdigitalTee.component_metadata
CapNInterdigitalTee.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.CircleCaterpillar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CircleCaterpillar
.. autosummary::
:toctree: ../stubs/

CircleCaterpillar.TOOLTIP
CircleCaterpillar.class_name
CircleCaterpillar.component_metadata
CircleCaterpillar.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.CircleRaster.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CircleRaster
.. autosummary::
:toctree: ../stubs/

CircleRaster.TOOLTIP
CircleRaster.class_name
CircleRaster.component_metadata
CircleRaster.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.CoupledLineTee.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CoupledLineTee
.. autosummary::
:toctree: ../stubs/

CoupledLineTee.TOOLTIP
CoupledLineTee.class_name
CoupledLineTee.component_metadata
CoupledLineTee.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.LaunchpadWirebond.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ LaunchpadWirebond
.. autosummary::
:toctree: ../stubs/

LaunchpadWirebond.TOOLTIP
LaunchpadWirebond.class_name
LaunchpadWirebond.component_metadata
LaunchpadWirebond.default_options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ LaunchpadWirebondCoupled
.. autosummary::
:toctree: ../stubs/

LaunchpadWirebondCoupled.TOOLTIP
LaunchpadWirebondCoupled.class_name
LaunchpadWirebondCoupled.component_metadata
LaunchpadWirebondCoupled.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.LineTee.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ LineTee
.. autosummary::
:toctree: ../stubs/

LineTee.TOOLTIP
LineTee.class_name
LineTee.component_metadata
LineTee.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.NGon.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ NGon
.. autosummary::
:toctree: ../stubs/

NGon.TOOLTIP
NGon.class_name
NGon.component_metadata
NGon.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.NSquareSpiral.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ NSquareSpiral
.. autosummary::
:toctree: ../stubs/

NSquareSpiral.TOOLTIP
NSquareSpiral.class_name
NSquareSpiral.component_metadata
NSquareSpiral.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.OpenToGround.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ OpenToGround
.. autosummary::
:toctree: ../stubs/

OpenToGround.TOOLTIP
OpenToGround.class_name
OpenToGround.component_metadata
OpenToGround.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.Rectangle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Rectangle
.. autosummary::
:toctree: ../stubs/

Rectangle.TOOLTIP
Rectangle.class_name
Rectangle.component_metadata
Rectangle.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RectangleHollow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RectangleHollow
.. autosummary::
:toctree: ../stubs/

RectangleHollow.TOOLTIP
RectangleHollow.class_name
RectangleHollow.component_metadata
RectangleHollow.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.ResonatorCoilRect.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ResonatorCoilRect
.. autosummary::
:toctree: ../stubs/

ResonatorCoilRect.TOOLTIP
ResonatorCoilRect.class_name
ResonatorCoilRect.component_metadata
ResonatorCoilRect.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RouteAnchors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RouteAnchors
.. autosummary::
:toctree: ../stubs/

RouteAnchors.TOOLTIP
RouteAnchors.class_name
RouteAnchors.component_metadata
RouteAnchors.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RouteFramed.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RouteFramed
.. autosummary::
:toctree: ../stubs/

RouteFramed.TOOLTIP
RouteFramed.class_name
RouteFramed.component_metadata
RouteFramed.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RouteMeander.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RouteMeander
.. autosummary::
:toctree: ../stubs/

RouteMeander.TOOLTIP
RouteMeander.class_name
RouteMeander.component_metadata
RouteMeander.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RouteMixed.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RouteMixed
.. autosummary::
:toctree: ../stubs/

RouteMixed.TOOLTIP
RouteMixed.class_name
RouteMixed.component_metadata
RouteMixed.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RoutePathfinder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RoutePathfinder
.. autosummary::
:toctree: ../stubs/

RoutePathfinder.TOOLTIP
RoutePathfinder.class_name
RoutePathfinder.component_metadata
RoutePathfinder.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.RouteStraight.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RouteStraight
.. autosummary::
:toctree: ../stubs/

RouteStraight.TOOLTIP
RouteStraight.class_name
RouteStraight.component_metadata
RouteStraight.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.ShortToGround.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ShortToGround
.. autosummary::
:toctree: ../stubs/

ShortToGround.TOOLTIP
ShortToGround.class_name
ShortToGround.component_metadata
ShortToGround.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.TransmonConcentric.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ TransmonConcentric
.. autosummary::
:toctree: ../stubs/

TransmonConcentric.TOOLTIP
TransmonConcentric.class_name
TransmonConcentric.component_metadata
TransmonConcentric.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.TransmonCross.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ TransmonCross
.. autosummary::
:toctree: ../stubs/

TransmonCross.TOOLTIP
TransmonCross.class_name
TransmonCross.component_metadata
TransmonCross.default_options
Expand Down
1 change: 1 addition & 0 deletions docs/apidocs/qiskit_metal.qlibrary.TransmonCrossFL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ TransmonCrossFL
.. autosummary::
:toctree: ../stubs/

TransmonCrossFL.TOOLTIP
TransmonCrossFL.class_name
TransmonCrossFL.component_metadata
TransmonCrossFL.default_options
Expand Down
Loading

0 comments on commit 9059f04

Please sign in to comment.