diff --git a/.github/workflows/manylinux_build.yml b/.github/workflows/manylinux_build.yml index 4f018c0..cec8e24 100644 --- a/.github/workflows/manylinux_build.yml +++ b/.github/workflows/manylinux_build.yml @@ -27,7 +27,7 @@ jobs: - name: Build manylinux1 Python wheels 🎡 uses: RalfG/python-wheels-manylinux-build@v0.2.2-manylinux1_x86_64 with: - python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310' + python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39' # build-requirements: 'cython numpy' # system-packages: 'lrzip-devel zlib-devel' package-path: '' @@ -35,13 +35,13 @@ jobs: - name: Build manylinux2010 Python wheels 🎡 uses: RalfG/python-wheels-manylinux-build@v0.2.2-manylinux2010_x86_64 with: - python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310' + python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39' package-path: '' pip-wheel-args: '--no-deps' - name: Build manylinux2014 Python wheels 🎡 uses: RalfG/python-wheels-manylinux-build@v0.2.2-manylinux2014_x86_64 with: - python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310' + python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39' package-path: '' pip-wheel-args: '--no-deps' - name: Upload Artifacts 🚀 @@ -51,7 +51,7 @@ jobs: path: wheelhouse/ - name: "Run Tests" run: | - PYVERSIONS=("36" "37" "38" "39" "310") + PYVERSIONS=("36" "37" "38" "39") for PYVERSION in "${PYVERSIONS[@]}"; do for whl in wheelhouse/pyms_nist_search-*-cp${PYVERSION}-cp${PYVERSION}*-manylinux*.whl; do # Test tox with wheels @@ -59,10 +59,6 @@ jobs: # TODO: Upload coverage to coveralls done done - - uses: actions/upload-artifact@v3 - with: - name: wheels - path: wheelhouse/ - name: Upload distribution 📦 to PyPI if: startsWith(github.ref, 'refs/tags/') uses: pypa/gh-action-pypi-publish@master diff --git a/tox.ini b/tox.ini index c9105dc..190ee71 100644 --- a/tox.ini +++ b/tox.ini @@ -4,8 +4,6 @@ # * envlists # * testenv:docs # * testenv:build -# * testenv:lint -# * testenv:mypy # * testenv:pyup # * testenv:coverage # * flake8 @@ -47,45 +45,6 @@ commands = twine check dist/*.tar.gz dist/*.whl check-wheel-contents dist/ -[testenv:lint] -basepython = python3.6 -changedir = {toxinidir} -ignore_errors = True -skip_install = True -deps = - flake8>=3.8.2 - flake8-2020>=1.6.0 - flake8-builtins>=1.5.3 - flake8-docstrings>=1.5.0 - flake8-dunder-all>=0.1.1 - flake8-encodings>=0.1.0 - flake8-github-actions>=0.1.0 - flake8-noqa>=1.1.0 - flake8-pyi>=20.10.0 - flake8-pytest-style>=1.3.0 - flake8-quotes>=3.3.0 - flake8-slots>=0.1.0 - flake8-sphinx-links>=0.0.4 - flake8-strftime>=0.1.1 - flake8-typing-imports>=1.10.0 - git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git - git+https://github.com/domdfcoding/flake8-rst-docstrings.git - git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods - pydocstyle>=6.0.0 - pygments>=2.7.1 - importlib_metadata<4.5.0; python_version<'3.8' -commands = python3 -m flake8_rst_docstrings_sphinx src/pyms_nist_search tests MoNA_GCMS_Library --allow-toolbox {posargs} - -[testenv:mypy] -basepython = python3.6 -ignore_errors = True -changedir = {toxinidir} -deps = - mypy==0.931 - -r{toxinidir}/tests/requirements.txt - -r{toxinidir}/stubs.txt -commands = mypy src/pyms_nist_search tests MoNA_GCMS_Library {posargs} - [testenv:pyup] basepython = python3.6 skip_install = True @@ -159,6 +118,45 @@ toplevel = pyms_nist_search addopts = --color yes --durations 25 timeout = 300 +[testenv:lint] +basepython = python3.6 +changedir = {toxinidir} +ignore_errors = True +skip_install = True +deps = + flake8>=3.8.2 + flake8-2020>=1.6.0 + flake8-builtins>=1.5.3 + flake8-docstrings>=1.5.0 + flake8-dunder-all>=0.1.1 + flake8-encodings>=0.1.0 + flake8-github-actions>=0.1.0 + flake8-noqa>=1.1.0 + flake8-pyi>=20.10.0 + flake8-pytest-style>=1.3.0 + flake8-quotes>=3.3.0 + flake8-slots>=0.1.0 + flake8-sphinx-links>=0.0.4 + flake8-strftime>=0.1.1 + flake8-typing-imports>=1.10.0 + git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git + git+https://github.com/domdfcoding/flake8-rst-docstrings.git + git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods + pydocstyle>=6.0.0 + pygments>=2.7.1 + importlib_metadata<4.5.0; python_version<'3.8' +commands = python3 -m flake8_rst_docstrings_sphinx src/pyms_nist_search tests MoNA_GCMS_Library --allow-toolbox {posargs} + +[testenv:mypy] +basepython = python3.6 +ignore_errors = True +changedir = {toxinidir} +deps = + mypy==0.931 + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/stubs.txt +commands = mypy src/pyms_nist_search tests MoNA_GCMS_Library {posargs} + [testenv] setenv = PYTHONDEVMODE=1