build: restore toml 0.10.0 (see #200)

andreoliwa · Sep 18, 2020 · 0bc796f · 0bc796f
1 parent 926b03d
commit 0bc796f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 35 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ flake8 = ">=3.0.0"
 attrs = "*"
 # TODO: Version 0.10.1 still raises "ValueError: Circular reference", see https://github.com/andreoliwa/nitpick/issues/160
 #  The commit with the fix was not released yet: https://github.com/uiri/toml/commit/9be64582fff86b9c5bd94ce52a5fedcb3d4fac01
-toml = { git = "https://github.com/uiri/toml.git", rev = "9be6458" }
+toml = "<0.10.1"
 requests = "*"
 dictdiffer = "*"
 "ruamel.yaml" = "*"

diff --git a/setup.cfg b/setup.cfg
@@ -80,20 +80,7 @@ envlist = clean,lint,py39,py38,py37,py36,py35,report
 
 [testenv]
 description = Run tests with pytest and coverage
-deps =
-    # Minimum versions To avoid errors like:
-    # Direct url requirement (like toml@ git+https://github.com/uiri/toml.git@9be6458) are not allowed for dependencies
-    # This version of pip does not implement PEP 517 so it cannot build a wheel without 'setuptools' and 'wheel'.
-    pip >= 20.1.1
-    setuptools
-    wheel
-
-    pytest-cov
-
-    # TODO: Force install from Git, otherwise version 0.10.1 is installed
-    # This version still raises "ValueError: Circular reference", see https://github.com/andreoliwa/nitpick/issues/160
-    # The commit with the fix was not released yet: https://github.com/uiri/toml/commit/9be64582fff86b9c5bd94ce52a5fedcb3d4fac01
-    git+https://github.com/uiri/toml.git@9be64582fff86b9c5bd94ce52a5fedcb3d4fac01
+deps = pytest-cov
 extras = test
 depends =
     {py39,py38,py37,py36,py35}: clean
@@ -123,20 +110,8 @@ extras =
     lint
     test
 deps =
-    # Minimum versions To avoid errors like:
-    # Direct url requirement (like toml@ git+https://github.com/uiri/toml.git@9be6458) are not allowed for dependencies
-    # This version of pip does not implement PEP 517 so it cannot build a wheel without 'setuptools' and 'wheel'.
-    pip >= 20.1.1
-    setuptools
-    wheel
-
     pre-commit
     safety
-
-    # TODO: Force install from Git, otherwise version 0.10.1 is installed
-    # This version still raises "ValueError: Circular reference", see https://github.com/andreoliwa/nitpick/issues/160
-    # The commit with the fix was not released yet: https://github.com/uiri/toml/commit/9be64582fff86b9c5bd94ce52a5fedcb3d4fac01
-    git+https://github.com/uiri/toml.git@9be64582fff86b9c5bd94ce52a5fedcb3d4fac01
 commands =
     pre-commit run --all-files
     safety check