Skip to content

Commit c43079c

Browse files
committed
Merge branch 'master' into issue-139
2 parents a8a6c0e + d75d9ad commit c43079c

Some content is hidden

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

84 files changed

+4169
-21720
lines changed

CONTRIBUTING.md renamed to .github/contributing.md

+11
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,14 @@ Please note we have a code of conduct, please follow it in all your interactions
2222
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
2323
7. You may merge the Pull Request in once you have the sign-off of one other developer. If you
2424
do not have permission to do that, you may request reviewer to merge it for you.
25+
26+
## Decorum
27+
28+
- Participants will be tolerant of opposing views.
29+
- Participants must ensure that their language and actions are free of personal
30+
attacks and disparaging personal remarks.
31+
- When interpreting the words and actions of others, participants should always
32+
assume good intentions.
33+
- Behaviour which can be reasonably considered harassment will not be tolerated.
34+
35+
Based on [Ruby's Community Conduct Guideline](https://www.ruby-lang.org/en/conduct/)

.github/workflows/publish-docs.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
78
jobs:
89
build:
910

@@ -17,6 +18,7 @@ jobs:
1718
run: |
1819
git config --global user.name 'travis-ci'
1920
git config --global user.email '[email protected]'
21+
2022
- name: Filter changed file paths to outputs
2123
uses: dorny/[email protected]
2224
id: changes
@@ -28,11 +30,14 @@ jobs:
2830
docs:
2931
- 'docs/**/*.rst'
3032
- 'docs/**/*.md'
33+
- 'examples/**'
3134
python_files:
3235
- 'tmuxp/**'
36+
3337
- name: Should publish
3438
if: steps.changes.outputs.docs == 'true' || steps.changes.outputs.root_docs == 'true' || steps.changes.outputs.python_files == 'true'
3539
run: echo "PUBLISH=$(echo true)" >> $GITHUB_ENV
40+
3641
- name: Set up Python ${{ matrix.python-version }}
3742
uses: actions/setup-python@v1
3843
with:
@@ -47,10 +52,13 @@ jobs:
4752
- name: Install poetry
4853
if: env.PUBLISH == 'true'
4954
run: |
50-
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
51-
python get-poetry.py -y --version 1.0.10
52-
echo "PATH=$HOME/.poetry/bin:$PATH" >> $GITHUB_ENV
53-
rm get-poetry.py
55+
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
56+
python install-poetry.py -y --version 1.1.7
57+
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
58+
rm install-poetry.py
59+
60+
- name: Add ~/.local/bin to PATH
61+
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
5462

5563
- name: Get poetry cache paths from config
5664
if: env.PUBLISH == 'true'

.github/workflows/tests.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: [ '2.7', '3.x' ]
14-
tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', 'master' ]
13+
python-version: [ '3.x' ]
14+
tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', '3.2a', 'master' ]
1515
steps:
1616
- uses: actions/checkout@v1
1717

@@ -27,10 +27,13 @@ jobs:
2727

2828
- name: Install poetry
2929
run: |
30-
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
31-
python get-poetry.py -y --version 1.0.10
30+
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
31+
python install-poetry.py -y --version 1.1.7
3232
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
33-
rm get-poetry.py
33+
rm install-poetry.py
34+
35+
- name: Add ~/.local/bin to PATH
36+
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
3437

3538
- name: Get poetry cache paths from config
3639
run: |

.gitmodules

-1
This file was deleted.

.tool-versions

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
poetry 1.1.7

0 commit comments

Comments
 (0)