Skip to content

Commit 766732b

Browse files
authored
Merge pull request #141 from bollwyvl/patch-1
add setuptools dependency for pkg_resources, sort deps
2 parents 55ac353 + b6df794 commit 766732b

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/python-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
key: venv-${{ github.event_name }}-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
4646

4747
- name: Ensure cache is healthy
48-
if: steps.cache.outputs.cache-hit == 'true' && runner.os == 'Linux'
48+
if: steps.cache.outputs.cache-hit == 'true'
49+
shell: bash
4950
run: timeout 10s poetry run pip --version || rm -rf .venv
5051

5152
- name: Install dependencies

poetry.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ classifiers = [
3434
]
3535

3636
[tool.poetry.dependencies]
37-
python = ">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*, != 3.4.*"
3837
jsonschema = ">=3.2.0, <4.0.0"
38+
openapi-schema-validator = "<0.2.0"
39+
pathlib2 = {version = "*", python = "~2.7"}
3940
pyrsistent = "<0.17.0"
41+
python = ">= 2.7, != 3.0.*, != 3.1.*, != 3.2.*, != 3.3.*, != 3.4.*"
4042
PyYAML = ">=5.1"
41-
six = "*"
42-
pathlib2 = {version = "*", python = "~2.7"}
43-
openapi-schema-validator = "<0.2.0"
4443
requests = {version = "*", optional = true}
44+
setuptools = "*"
45+
six = "*"
4546

4647
[tool.poetry.extras]
4748
dev = ["pre-commit"]

0 commit comments

Comments
 (0)