From 0bc796fb4e07950b6920c0e9e7bc5175ac1203ce Mon Sep 17 00:00:00 2001
From: "Augusto W. Andreoli" <andreoliwa@gmail.com>
Date: Fri, 18 Sep 2020 04:25:09 +0200
Subject: [PATCH] build: restore toml 0.10.0 (see #200)

---
 poetry.lock    | 16 ++++++++--------
 pyproject.toml |  2 +-
 setup.cfg      | 27 +--------------------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 31857774..040042c8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -834,13 +834,9 @@ category = "main"
 description = "Python Library for Tom's Obvious, Minimal Language"
 name = "toml"
 optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "0.10.1"
+python-versions = "*"
+version = "0.10.0"
 
-[package.source]
-reference = "9be64582fff86b9c5bd94ce52a5fedcb3d4fac01"
-type = "git"
-url = "https://github.com/uiri/toml.git"
 [[package]]
 category = "dev"
 description = "Traitlets Python config system"
@@ -923,7 +919,7 @@ lint = ["pylint"]
 test = ["pytest", "testfixtures", "responses"]
 
 [metadata]
-content-hash = "d123a479651287be674fc17a38d863db8d527118fdd12dbe0849b5770feb0d31"
+content-hash = "cd4ab91a9742dc79020ee7adb744525b7dadf169aec4709e317ce5c7be38cf76"
 lock-version = "1.0"
 python-versions = "^3.5 || ^3.6 || ^3.7 || ^3.8"
 
@@ -1275,7 +1271,11 @@ text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
 ]
-toml = []
+toml = [
+    {file = "toml-0.10.0-py2.7.egg", hash = "sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"},
+    {file = "toml-0.10.0-py2.py3-none-any.whl", hash = "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"},
+    {file = "toml-0.10.0.tar.gz", hash = "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c"},
+]
 traitlets = [
     {file = "traitlets-4.3.3-py2.py3-none-any.whl", hash = "sha256:70b4c6a1d9019d7b4f6846832288f86998aa3b9207c6821f3578a6a6a467fe44"},
     {file = "traitlets-4.3.3.tar.gz", hash = "sha256:d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7"},
diff --git a/pyproject.toml b/pyproject.toml
index 4c6aa3e0..2c2839e5 100644
--- 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
index cefa86cd..3adbb813 100644
--- 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