Skip to content

Try to migrate pymeasure to python 3.12 and numpy 2 #11

New issue

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

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

Already on GitHub? # to your account

Draft
wants to merge 3 commits into
base: og-pymeasure
Choose a base branch
from
Draft
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
40 changes: 40 additions & 0 deletions .github/workflows/apply_sw4hw_standards.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Apply SW4HW Standards
on:
workflow_dispatch:

pull_request:
types: [opened, reopened, synchronize, edited]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
standardize:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Run pip install
shell: bash
run:
pip install -r ./requirements.txt

- name: Run tests
shell: bash
run:
python -m pytest tests/instruments --showlocals --full-trace --cov=pymeasure --cov-report xml:coverage.xml --cov-report term-missing --junitxml junit.xml

- name: Upload test artifacts
uses: actions/upload-artifact@v4
with:
name: unit-test-artifacts-${{ github.head_ref }}
path: ./**/*.xml
106 changes: 0 additions & 106 deletions .github/workflows/pymeasure_CI.yml

This file was deleted.

4 changes: 4 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-e .[tests]
pytest
pytest-cov
pydantic
2 changes: 0 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ install_requires =
pandas >= 0.14
pyvisa >= 1.8
pyserial >= 2.7
pyqtgraph >= 0.9.10
importlib-metadata; python_version<"3.8"

[options.extras_require]
Expand All @@ -41,7 +40,6 @@ tcp =
python-vxi11 = python-vxi11>=0.9
tests =
pytest >= 2.9.1
pytest-qt >= 2.4.0 # install pyqt or pyside manually as desired
pyvisa-sim >= 0.4.0

[flake8]
Expand Down
2 changes: 2 additions & 0 deletions tests/instruments/integration/keithley/test_keithley2750.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
import pytest

from pymeasure.instruments.keithley.keithley2750 import clean_closed_channels

pytest.skip('Only work with connected hardware (or something else, the test otherwise times out)', allow_module_level=True)

def test_clean_closed_channels():
# Example outputs from `self.ask(":ROUTe:CLOSe?")`
Expand Down
Loading