Skip to content
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

Tables #22

Merged
merged 14 commits into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"] # can add windows-latest, macos-latest
python: ["3.7", "3.8", "3.9", "3.10"]
python: ["3.7", "3.8", "3.10"]
pipenv: ["skip-lock"]

include:
Expand Down
11 changes: 2 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,12 @@ repos:
name: Run black
stages: [commit]
language: system
entry: pipenv run black --check --diff
entry: black --check --diff
types: [python]

- id: flake8
name: Run flake8
stages: [commit]
language: system
entry: pipenv run flake8
entry: flake8
types: [python]

- id: mypy
name: Run mypy
stages: [commit]
language: system
entry: pipenv run mypy src tests
pass_filenames: false
16 changes: 14 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
// The default config in setup.cfg's "[tool:pytest]" adds coverage.
// Cannot have coverage and debugging at the same time.
// https://github.com/microsoft/vscode-python/issues/693
"PYTEST_ADDOPTS": "--no-cov"
"PYTEST_ADDOPTS": "--no-cov",
"PYTEST_RAISE": "1",
},
},
{
Expand Down Expand Up @@ -273,7 +274,18 @@
"console": "integratedTerminal"
},
{
"name": "Write Schema",
"name": "Write Producer Schema",
"type": "python",
"request": "launch",
"program": "${workspaceFolder:pvi}/src/pvi",
"args": [
"schema",
"${workspaceFolder:pvi}/schemas/pvi.device.schema.json"
],
"console": "integratedTerminal"
},
{
"name": "Write Device Schema",
"type": "python",
"request": "launch",
"program": "${workspaceFolder:pvi}/src/pvi",
Expand Down
6 changes: 3 additions & 3 deletions docs/how-to/write-a-formatter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ dependencies.
Define the Screen Layout Properties
-----------------------------------
Each screen requires a number of layout properties that allow you to customise the size
and placement of widgets. These are stored within a 'LayoutProperties' dataclass that can
and placement of widgets. These are stored within a 'ScrenLayout' dataclass that can
be imported from utils.py. Within the dataclass are the following configurable parameters:

.. literalinclude:: ../../src/pvi/_format/utils.py
:pyobject: LayoutProperties
.. literalinclude:: ../../src/pvi/_format/screen.py
:pyobject: ScreenLayout

When defining these in our formatter, we have the option of deciding which properties
should be configurable inside of the formatter.yaml. Properties defined as member
Expand Down
2 changes: 1 addition & 1 deletion docs/snippets/pilatusDetectorParamSet.h

Large diffs are not rendered by default.

Loading