Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhandberg committed Apr 7, 2021
2 parents 23515d0 + abc4fab commit f8ce701
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ name: Tests
on:
push:
branches: [master, devel]
tags: 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
pull_request:
branches: [master, devel]
schedule:
- cron: '0 6 1 * *' # once a month in the morning

jobs:

# Run unit tests on Linux, OSX and Windows
pytest:
strategy:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master-v2.0
master-v2.0.1
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest
flake8
flake8-tabs
flake8-tabs !=2.3.0,!=2.3.1
flake8-builtins
flake8-logging-format
numpy == 1.19.2
Expand Down

0 comments on commit f8ce701

Please sign in to comment.