Skip to content

Commit 0e71d86

Browse files
authored
ci: Update packages and lock poetry at 1.0.10 (#300)
Poetry 1.1 has lockfile incompatibilities. See also: tmux-python/tmuxp@b6e0683
2 parents 7f19397 + cac96b2 commit 0e71d86

File tree

5 files changed

+226
-205
lines changed

5 files changed

+226
-205
lines changed

.github/workflows/publish-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Install poetry
3232
run: |
3333
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
34-
python get-poetry.py -y
34+
python get-poetry.py -y --version 1.0.10
3535
echo "::set-env name=PATH::$HOME/.poetry/bin:$PATH"
3636
rm get-poetry.py
3737

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install poetry
2929
run: |
3030
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
31-
python get-poetry.py -y
31+
python get-poetry.py -y --version 1.0.10
3232
echo "::set-env name=PATH::$HOME/.poetry/bin:$PATH"
3333
rm get-poetry.py
3434

libtmux/_compat.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@
2020
itervalues = lambda d: d.itervalues()
2121
iteritems = lambda d: d.iteritems()
2222

23+
from itertools import imap, izip
24+
25+
import ConfigParser as configparser
26+
import cPickle as pickle
2327
from cStringIO import StringIO as BytesIO
2428
from StringIO import StringIO
25-
import cPickle as pickle
26-
import ConfigParser as configparser
27-
28-
from itertools import izip, imap
2929

3030
range_type = xrange
3131

3232
cmp = cmp
3333

3434
input = raw_input
35+
from collections import MutableMapping
3536
from string import lower as ascii_lowercase
36-
import urlparse
3737

38-
from collections import MutableMapping
38+
import urlparse
3939

4040
exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
4141

@@ -60,9 +60,9 @@ def console_to_str(s):
6060
itervalues = lambda d: iter(d.values())
6161
iteritems = lambda d: iter(d.items())
6262

63-
from io import StringIO, BytesIO
64-
import pickle
6563
import configparser
64+
import pickle
65+
from io import BytesIO, StringIO
6666

6767
izip = zip
6868
imap = map
@@ -71,9 +71,9 @@ def console_to_str(s):
7171
cmp = lambda a, b: (a > b) - (a < b)
7272

7373
input = input
74-
from string import ascii_lowercase
7574
import urllib.parse as urllib
7675
import urllib.parse as urlparse
76+
from string import ascii_lowercase
7777
from urllib.request import urlretrieve
7878

7979
console_encoding = sys.__stdout__.encoding

libtmux/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from distutils.version import LooseVersion
1616

1717
from . import exc
18-
from ._compat import console_to_str, str_from_console, MutableMapping
18+
from ._compat import MutableMapping, console_to_str, str_from_console
1919

2020
logger = logging.getLogger(__name__)
2121

0 commit comments

Comments
 (0)