Skip to content
Open
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
3 changes: 1 addition & 2 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Run install
run: |
pip install setuptools
pip install .
- name: Lint with Pylint
run: |
Expand All @@ -38,7 +37,7 @@ jobs:
pylint --rcfile=.pylintrc nixio
- name: Test with pytest
run: |
pip install pytest scipy pillow matplotlib
pip install .[test]
# pytest will skip cross-compatibility tests since NIX isn't installed
pytest
Expand Down
15 changes: 10 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ environment:


matrix:
- PYTHON: "C:/Python38-x64"
- PYTHON: "C:/Python311-x64"

# - PYTHON: "C:/Python38-x64"
# - PYTHON: "C:/Python311-x64"
- TOXENV: py39 # https://devguide.python.org/versions
- TOXENV: py311
- TOXENV: py313

init:
- "ECHO %PYTHON% %vcvars% (%bits%)"
- ps: $env:PATH = "$env:PYTHON;$env:PATH;C:\Program Files\7-Zip;$env:NIX_DIR\bin"
Expand Down Expand Up @@ -53,7 +56,8 @@ install:
# - cd ..
- python -m pip install certifi
- python -m pip install -U pip wheel
- python -m pip install numpy h5py pytest-xdist scipy pillow matplotlib
- python -m pip install numpy h5py pytest pytest-xdist scipy pillow matplotlib
- python -m pip install tox
- ps: cd "$env:APPVEYOR_BUILD_FOLDER"
- set DISTUTILS_USE_SDK="1"
- set MSSdk="1"
Expand All @@ -64,7 +68,8 @@ build_script:
test_script:
# TODO: Force cross-compatibility tests
# - python setup.py test --addopts "--force-compat"
- python setup.py test --addopts "-nauto"
# - python setup.py test --addopts "-nauto"
- py -m tox

after_test:
- ps: mkdir "$env:DEPLOY_DIR"
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ def get_wheel_data():
packages=packages,
scripts=[],
python_requires=">=3.6",
tests_require=['pytest', 'scipy', 'pillow', 'matplotlib'],
test_suite='pytest',
setup_requires=['pytest-runner'],
extras_require={
"test": ['pytest', 'scipy', 'pillow', 'matplotlib', 'setuptools'],
},
install_requires=['numpy', 'h5py'],
package_data={'nixio': [license_text, description_text]},
include_package_data=True,
Expand Down
9 changes: 9 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# tox.ini

[tox]
envlist = py3{9,11,13}

[testenv]
description = Unit tests
deps = pytest
commands = pytest
Loading