Skip to content

Commit acef8eb

Browse files
committed
Fix Poetry with py27
1 parent b9d15cf commit acef8eb

File tree

3 files changed

+35
-32
lines changed

3 files changed

+35
-32
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ script:
2424
- 'coverage run --source=src/onelogin/saml2 --rcfile=tests/coverage.rc setup.py test'
2525
- 'coverage report -m --rcfile=tests/coverage.rc'
2626
# - 'pylint src/onelogin/saml2 --rcfile=tests/pylint.rc'
27-
- 'flake8 --toml-config pyproject.toml'
27+
# - 'flake8 --toml-config pyproject.toml'
28+
- 'flake8 .'

pyproject.toml

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,46 +40,48 @@ lxml = ">=4.6.5, !=4.7.0"
4040
xmlsec = ">=1.3.9"
4141
isodate = ">=0.6.1"
4242

43-
[tool.poetry.group.dev]
44-
optional = true
45-
46-
[tool.poetry.group.dev.dependencies]
47-
black = "*"
48-
isort = {version = "^5.10.1", extras = ["pyproject"]}
49-
flake8 = ">=3.6.0"
50-
Flake8-pyproject = "^1.1.0.post0"
51-
flake8-bugbear = "^22.8.23"
52-
flake8-logging-format = "^0.7.5"
53-
ipdb = "^0.13.9"
54-
55-
[tool.poetry.group.test]
56-
optional = true
57-
58-
[tool.poetry.group.test.dependencies]
59-
freezegun= ">=0.3.11, <=1.1.0"
60-
pytest = ">=6.0"
61-
flake8 = ">=3.6.0"
43+
#[tool.poetry.group.dev]
44+
#optional = true
45+
46+
#[tool.poetry.group.dev.dependencies]
47+
#black = "*"
48+
#isort = {version = "^5.10.1", extras = ["pyproject"]}
49+
flake8 = { version = ">=3.6.0, <=5.0.0", optional = true}
50+
#Flake8-pyproject = "^1.1.0.post0"
51+
#flake8-bugbear = "^22.8.23"
52+
#flake8-logging-format = "^0.7.5"
53+
ipdb = { version = "^0.13.9", optional = true}
54+
#[tool.poetry.group.test.dependencies]
55+
freezegun= { version = ">=0.3.11, <=1.1.0", optional = true}
56+
pytest = { version = ">=4.6.11", optional = true}
57+
coverage = { version = ">=4.5.2", optional = true}
6258
#pylint = ">=1.9.4"
6359

64-
[tool.poetry.group.coverage]
65-
optional = true
60+
[tool.poetry.extras]
61+
test = ["flake8", "ipdb", "freezegun", "pytest", "coverage"]
6662

67-
[tool.poetry.group.coverage.dependencies]
68-
coverage = ">=4.5.2"
69-
pytest-cov = "*"
63+
#[tool.poetry.group.test]
64+
#optional = true
7065

71-
[tool.poetry.group.docs]
72-
optional = true
66+
#[tool.poetry.group.coverage]
67+
#optional = true
7368

74-
[tool.poetry.group.docs.dependencies]
75-
sphinx = "*"
69+
#[tool.poetry.group.coverage.dependencies]
70+
#coverage = ">=4.5.2"
71+
#pytest-cov = "*"
72+
73+
#[tool.poetry.group.docs]
74+
#optional = true
75+
76+
#[tool.poetry.group.docs.dependencies]
77+
#sphinx = "*"
7678

7779
[build-system]
78-
requires = ["poetry-core"]
80+
requires = ["poetry>=1.1.15"]
7981
build-backend = "poetry.core.masonry.api"
8082

8183
[tool.pytest.ini_options]
82-
minversion = "6.0"
84+
minversion = "4.6.11"
8385
addopts = "-ra -vvv"
8486
testpaths = [
8587
"tests",

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
'coverage>=4.5.2',
4444
'freezegun>=0.3.11, <=1.1.0',
4545
# 'pylint>=1.9.4',
46-
'flake8>=3.6.0',
46+
'flake8>=3.6.0, <=5.0.0',
4747
'pytest>=4.6',
4848
),
4949
},

0 commit comments

Comments
 (0)