From 56682fd87dfc0c653b830b3497f72f5bb3ddc663 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Fri, 12 Aug 2022 12:50:02 -0400 Subject: [PATCH 1/2] Add setuptools to dev-requirements to fix versioneer error and revert patch --- dev-requirements.txt | 1 + versioneer.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index d456efc5c..79b8759a1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -12,6 +12,7 @@ pytest-cov==3.0.0 pytest-env==0.6.2 pytest==6.2.2 requests-mock==1.9.3 +setuptools>=64.0.2 types-PyYAML==6.0.11 types-redis==4.3.4 types-toml==0.10.8 diff --git a/versioneer.py b/versioneer.py index b025b9fd2..63576dfb2 100644 --- a/versioneer.py +++ b/versioneer.py @@ -1605,8 +1605,6 @@ def run(self): cfg = get_config_from_root(root) versions = get_versions() _build_py.run(self) - if self.editable_mode: - return # now locate _version.py in the new build/ directory and replace # it with an updated value From 3506108a19cadf9aa70381a41ae39e2240e03a1c Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Fri, 12 Aug 2022 12:55:28 -0400 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a1cea52..b15ad0154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,9 +70,10 @@ The types of changes are: ### Fixed -* Correct build arg variable name [925](https://github.com/ethyca/fidesops/pull/925) +* Correct build arg variable name [#925](https://github.com/ethyca/fidesops/pull/925) * Reduce number of clients connected to the application db [#944](https://github.com/ethyca/fidesops/pull/944) -* Patch versioneer to allow editable installs [1070](https://github.com/ethyca/fidesops/pull/1070) +* Patch versioneer to allow editable installs [#1070](https://github.com/ethyca/fidesops/pull/1070) +* Add setuptools to dev-requirements to fix versioneer error and revert patch [#1072](https://github.com/ethyca/fidesops/pull/1072) ## [1.6.3](https://github.com/ethyca/fidesops/compare/1.6.2...1.6.3)