Skip to content

Commit 0619a80

Browse files
committed
Merge branch 'release/0.11.0'
2 parents b1f621d + f9716c9 commit 0619a80

59 files changed

Lines changed: 3765 additions & 1014 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
* text=auto eol=lf
2+
3+
*.py text
4+
*.rst text
5+
*.toml text
6+
*.yml text
7+
*.md text
8+
9+
*.png binary
10+
*.jpg binary

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ We like to keep a clean history, so squash-rebase merges are preferred for the _
9393
### How to create release
9494

9595
1. Create a branch off of _development_ like **release/1.0.0** and add a commit to bump the version in `pyproject.toml` and `__version__.py`.
96-
2. Merge it into both _main_ and _release_
96+
2. Merge it into both _main_ and _development_
9797
3. Create a GitHub release from the head of main, following the existing convention for naming and release notes format, and the GitHub CI will do the rest.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
matrix:
5252
os: [Ubuntu, MacOS, Windows]
53-
python-version: [ '3.6', '3.7' , '3.8' ]
53+
python-version: ['3.6', '3.7', '3.8', '3.9']
5454

5555
steps:
5656
- uses: actions/checkout@v2

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
notes/
2+
13
# Byte-compiled / optimized / DLL files
24
__pycache__/
35
*.py[cod]
@@ -74,3 +76,4 @@ dmypy.json
7476
# Misc
7577
/TODO.md
7678
Dockerfile
79+
.vscode/

0 commit comments

Comments
 (0)