Skip to content

Hotfix CI (lmfit and filelock)

Victor Negîrneac requested to merge fix/ci_lmfit_and_filelock into develop

Explanation of changes

Minor changes to fix tests and CI.

5 min review

Motivation of changes

Adapt to changes in lmfit

https://github.com/lmfit/lmfit-py/compare/1.0.2...1.0.3#diff-8d57ebca369bd623a12bf6540a4e8e81f7c1fc0f817ce6bc62e9302320341c37L155

and changes to filelock

https://github.com/tox-dev/py-filelock/compare/3.3.0...3.3.1

Merge checklist

See also merge request guidelines

  • Merge request has been reviewed and approved by a project maintainer.
  • Merge request contains a clear description of the proposed changes and the issue it addresses.
  • Merge request made onto appropriate branch (develop for most MRs).
  • New code is fully tested.
  • New code is documented and docstrings use numpydoc format.
  • CHANGELOG.rst and AUTHORS.rst have been updated (when applicable).
  • CI pipelines pass
    • black code-formatting passes (gitlab-ci),
    • test suite passes (gitlab-ci),
    • no degradation in code-coverage (codacy),
    • no (serious) new pylint code quality issues introduced (codacy),
    • documentation builds successfully (CI and readthedocs),
    • windows tests pass (manually triggered by maintainers before merging).

For reference, the issues workflow is described in the contribution guidelines.

Edited by Damien Crielaard

Merge request reports