Skip to content

Commit

Permalink
Merge branch 'release/0.11.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
nat-n committed Nov 14, 2021
2 parents b1f621d + f9716c9 commit 0619a80
Show file tree
Hide file tree
Showing 59 changed files with 3,765 additions and 1,014 deletions.
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
* text=auto eol=lf

*.py text
*.rst text
*.toml text
*.yml text
*.md text

*.png binary
*.jpg binary
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ We like to keep a clean history, so squash-rebase merges are preferred for the _
### How to create release

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`.
2. Merge it into both _main_ and _release_
2. Merge it into both _main_ and _development_
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.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
strategy:
matrix:
os: [Ubuntu, MacOS, Windows]
python-version: [ '3.6', '3.7' , '3.8' ]
python-version: ['3.6', '3.7', '3.8', '3.9']

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
notes/

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -74,3 +76,4 @@ dmypy.json
# Misc
/TODO.md
Dockerfile
.vscode/
Loading

0 comments on commit 0619a80

Please sign in to comment.