diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cb3735b..e53d727 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,32 +15,32 @@ jobs: strategy: fail-fast: false matrix: - PYTHON_VERSION: ['3.7', '3.9', '3.10', '3.11'] + PYTHON_VERSION: ['3.9', '3.10', '3.11'] PIP_SELECTOR: ['[tests]'] - LABEL: [-RnMinor] + LABEL: [-RnMajor] include: - - PYTHON_VERSION: '3.8' - PIP_SELECTOR: '[tests]' - LABEL: -RnMajor - - PYTHON_VERSION: '3.8' - PIP_SELECTOR: '[tests]' - LABEL: -Release - - PYTHON_VERSION: '3.8' - PIP_SELECTOR: '[tests]' - LABEL: -RnPatch - - PYTHON_VERSION: '3.8' + # - PYTHON_VERSION: '3.8' + # PIP_SELECTOR: '[tests]' + # LABEL: -RnMinor + # - PYTHON_VERSION: '3.8' + # PIP_SELECTOR: '[tests]' + # LABEL: -Release + # - PYTHON_VERSION: '3.8' + # PIP_SELECTOR: '[tests]' + # LABEL: -RnPatch + - PYTHON_VERSION: '3.11' PIP_SELECTOR: '[tests, coverage]' - LABEL: -RnMinor-coverage + LABEL: -RnMajor-coverage PYTEST_ARGS_COVERAGE: --cov=. --cov-report=xml - os: ubuntu - PYTHON_VERSION: '3.7' + PYTHON_VERSION: '3.8' OLDEST_SUPPORTED_VERSION: true # Matching setup.py - DEPENDENCIES: traits==5.0 hyperspy==1.7.0 traitsui==6.1 pyqt5==5.12.0 + DEPENDENCIES: traits==5.0 traitsui==6.1 pyqt5==5.12.0 PIP_SELECTOR: '[tests]' # Hang at the end of the test suite run... #PYTEST_ARGS_COVERAGE: --cov=. --cov-report=xml - LABEL: -RnMinor-oldest + LABEL: -RnMajor-oldest steps: - uses: actions/checkout@v4 @@ -83,8 +83,6 @@ jobs: shell: bash if: contains( matrix.LABEL, 'RnMajor') run: | - # Remove once rosettasciio is released - pip install https://github.com/hyperspy/rosettasciio/archive/refs/heads/main.zip pip install https://github.com/hyperspy/hyperspy/archive/RELEASE_next_major.zip - name: Install HyperSpy (RELEASE_next_patch) diff --git a/hyperspy_gui_traitsui/tools.py b/hyperspy_gui_traitsui/tools.py index 92ae573..a0ce67a 100644 --- a/hyperspy_gui_traitsui/tools.py +++ b/hyperspy_gui_traitsui/tools.py @@ -540,11 +540,8 @@ def spikes_removal_traitsui(obj, **kwargs): ), tu.Group( 'add_noise', - 'interpolator_kind', 'default_spike_width', - tu.Group( - 'spline_order', - enabled_when='interpolator_kind == "Spline"'), + 'spline_order', show_border=True, label='Advanced settings'), ), diff --git a/setup.py b/setup.py index df75415..4adb72d 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,6 @@ # See https://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers=[ "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10",