Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Hotfix for failing tests in master build #298

Merged
merged 17 commits into from
May 11, 2021
Merged

Conversation

SabineHaas
Copy link
Collaborator

@SabineHaas SabineHaas commented Apr 23, 2021

Addresses #296

To test the hotfix, either #297 had to be solved first - or skip for failing tests had to be removed --> second option chosen --> todo

  • add skip again before merge

Changes proposed in this pull request:

  • Changed order of checks in github actions workflow - linting with black is last check now, to prevent failing due to black before pytest are run.
  • Move test_examples.py to examples folder to make tests work in CI

The following steps were realized, as well (required):

  • Update the CHANGELOG.md
  • Check if full simulation tests pass locally (EXECUTE_TESTS_ON=master pytest)

Also the following steps were realized (if applies):

  • Use in-line comments to explain your code
  • Write docstrings to your code
  • For new functionalities: Explain in readthedocs
  • Write test(s) for your new patch of code

Please mark above checkboxes as following:

  • Open
  • Done

In case of an error due to linting, run black . --exclude docs/ and push your changes.
Note that in case you do not fix a whole issue you should start your PR with Address #xyz.

For more information on how to contribute check the CONTRIBUTING.md.

@SabineHaas
Copy link
Collaborator Author

SabineHaas commented May 7, 2021

@MaGering @Piranias was easier than thought --> just had to move text_examples.py to the examples folder 🙈

The build passes for b3e85bb (apply black), where the tests of test_examples.py are run (skip removed).
I have now added the skip again, so that these tests are only run on master branch.

Unfortunately, I did a mistake: hotfixes are supposed to be merged into master branch, I selected dev and have already merged dev into the hotfix branch. So, as an exception we merge the hotfix to dev and it will find its way to master branch via the release branch.

@SabineHaas SabineHaas marked this pull request as ready for review May 7, 2021 09:01
CHANGELOG.md Outdated Show resolved Hide resolved
This was referenced May 7, 2021
@SabineHaas SabineHaas self-assigned this May 7, 2021
@SabineHaas SabineHaas merged commit ec17dfa into dev May 11, 2021
@SabineHaas SabineHaas deleted the hotfix/package_data branch May 11, 2021 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants