Merge pull request #102 from nexB/remove-duplicate-commoncode-util

Remove duplicate code for commoncode.datautils
aboutcode-org · Feb 26, 2024 · b8bb307 · b8bb307
2 parents 652c524 + 22239c0
commit b8bb307
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 249 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -29,7 +29,7 @@ html5lib==1.1
 idna==3.3
 importlib-metadata==4.8.3
 inflection==0.5.1
-intbitset==3.0.1
+intbitset==3.1.0
 isodate==0.6.1
 jaraco.functools==3.4.0
 javaproperties==0.8.1

diff --git a/setup.cfg b/setup.cfg
@@ -53,7 +53,6 @@ python_requires = >=3.7
 
 install_requires =
     attrs
-    htmllistparse
     commoncode
     packageurl-python
     requests

diff --git a/src/fetchcode/commoncode_datautils.py b/src/fetchcode/commoncode_datautils.py
diff --git a/src/fetchcode/packagedcode_models.py b/src/fetchcode/packagedcode_models.py
@@ -35,14 +35,14 @@
 from packageurl import normalize_qualifiers
 from packageurl import PackageURL
 
-from fetchcode.commoncode_datautils import choices
-from fetchcode.commoncode_datautils import Boolean
-from fetchcode.commoncode_datautils import Date
-from fetchcode.commoncode_datautils import Integer
-from fetchcode.commoncode_datautils import List
-from fetchcode.commoncode_datautils import Mapping
-from fetchcode.commoncode_datautils import String
-from fetchcode.commoncode_datautils import TriBoolean
+from commoncode.datautils import choices
+from commoncode.datautils import Boolean
+from commoncode.datautils import Date
+from commoncode.datautils import Integer
+from commoncode.datautils import List
+from commoncode.datautils import Mapping
+from commoncode.datautils import String
+from commoncode.datautils import TriBoolean
 
 
 """