Skip to content

Commit d929d1a

Browse files
committed
Merge branch 'master' into check_mypy
2 parents 528381b + f36d54c commit d929d1a

File tree

6 files changed

+828
-438
lines changed

6 files changed

+828
-438
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ on:
1111
jobs:
1212
ci:
1313
runs-on: ${{ matrix.os }}
14-
container: docker://altendky/hydra:ubuntu-3-minors
14+
container: docker://altendky/hydra:ubuntu-20.04-3-minors
1515
strategy:
16+
fail-fast: false
1617
matrix:
1718
os:
1819
- ubuntu-latest
1920
toxenv:
2021
- py36,report,codecov
2122
- py37,report,codecov
2223
- py38,report,codecov
24+
- py39,report,codecov
2325
- pypy3,report,codecov
2426
- doc
2527
- check

dev-requirements.txt

Lines changed: 593 additions & 272 deletions
Large diffs are not rendered by default.

requirements.txt

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.6
33
# To update, run:
44
#
55
# python pycli lock
66
#
7-
attrs==19.1.0 \
8-
--hash=sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79 \
9-
--hash=sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399
10-
dataclasses==0.6 \
11-
--hash=sha256:454a69d788c7fda44efd71e259be79577822f5e3f53f029a22d08004e951dc9f \
12-
--hash=sha256:6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84
13-
marshmallow==3.2.1 \
14-
--hash=sha256:077b4612f5d3b9333b736fdc6b963d2b46d409070f44ff3e6c4109645c673e83 \
15-
--hash=sha256:9a2f3e8ea5f530a9664e882d7d04b58650f46190178b2264c72b7d20399d28f0
16-
mypy-extensions==0.4.1 \
17-
--hash=sha256:37e0e956f41369209a3d5f34580150bcacfabaa57b33a15c0b25f4b5725e0812 \
18-
--hash=sha256:b16cabe759f55e3409a7d231ebd2841378fb0c27a5d1994719e340e4f429ac3e \
7+
attrs==21.2.0 \
8+
--hash=sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1 \
9+
--hash=sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
10+
# via -r requirements.in
11+
dataclasses==0.8 ; python_version < "3.7" \
12+
--hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \
13+
--hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97
14+
# via -r requirements.in
15+
marshmallow==3.13.0 \
16+
--hash=sha256:c67929438fd73a2be92128caa0325b1b5ed8b626d91a094d2f7f2771bf1f1c0e \
17+
--hash=sha256:dd4724335d3c2b870b641ffe4a2f8728a1380cd2e7e2312756715ffeaa82b842
18+
# via -r requirements.in
19+
mypy-extensions==0.4.3 \
20+
--hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \
21+
--hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8
1922
# via typing-inspect
20-
typing-inspect==0.4.0 \
21-
--hash=sha256:a7cb36c4a47d034766a67ea6467b39bd995cd00db8d4db1aa40001bf2d674a9b \
22-
--hash=sha256:cf41eb276cc8955a45e03c15cd1efa6c181a8775a38ff0bfda99d28af97bcda3 \
23-
--hash=sha256:e319dfa0c9a646614c9b6abab3bdd5f860a98609998d420f33e41a6e01cbbddb
23+
typing-extensions==3.10.0.0 \
24+
--hash=sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497 \
25+
--hash=sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342 \
26+
--hash=sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84
27+
# via typing-inspect
28+
typing-inspect==0.7.1 \
29+
--hash=sha256:047d4097d9b17f46531bf6f014356111a1b6fb821a24fe7ac909853ca2a782aa \
30+
--hash=sha256:3cd7d4563e997719a710a3bfe7ffb544c6b72069b6812a02e9b414a8fa3aaa6b \
31+
--hash=sha256:b1f56c0783ef0f25fb064a01be6e5407e54cf4a4bf4f3ba3fe51e0bd6dcea9e5
32+
# via -r requirements.in

setup.cfg

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ line_length = 120
2626
known_first_party = desert
2727
default_section = THIRDPARTY
2828
forced_separate = test_desert
29-
not_skip = __init__.py
3029
skip = migrations
31-
known_stdlib=dataclasses
3230
known_third_party=attr,marshmallow,pytest,setuptools,typing_inspect
33-
ignore =
31+
extend_skip =
3432
.flake8
3533
dev-requirements.in
3634
dev-requirements.txt

0 commit comments

Comments
 (0)