build: Removed dependency on libcoveocds (GPL)

open-contracting · Apr 27, 2022 · eeb74b2 · eeb74b2
1 parent 4b6aa6c
commit eeb74b2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.3.8 (2022-04-27)
+------------------
+
+Changed
+-------
+
+-  Removed dependency on `libcoveocds <https://pypi.org/project/libcoveocds/>`__ (GPL).
+
 0.3.7 (2022-03-11)
 ------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -26,7 +26,7 @@
 author = "Open Contracting Partnership"
 
 # The short X.Y version
-version = "0.3.7"
+version = "0.3.8"
 # The full version, including alpha/beta/rc tags
 release = version
 

diff --git a/ocdskingfishercolab/__init__.py b/ocdskingfishercolab/__init__.py
@@ -23,7 +23,6 @@
 from gspread_dataframe import set_with_dataframe
 from IPython import get_ipython
 from IPython.display import HTML
-from libcoveocds.config import LibCoveOCDSConfig
 from notebook import notebookapp
 from oauth2client.client import GoogleCredentials
 from pydrive2.auth import GoogleAuth
@@ -190,18 +189,17 @@ def save_dataframe_to_spreadsheet(dataframe, name):
     """
     write_data_as_json(dataframe['release_package'][0], 'release_package.json')
 
-    config = LibCoveOCDSConfig().config
     with warnings.catch_warnings():
         warnings.filterwarnings('ignore')  # flattentool uses UserWarning, so we can't set a specific category
 
         flattentool.flatten(
             'release_package.json',
-            main_sheet_name=config['root_list_path'],
-            root_list_path=config['root_list_path'],
-            root_id=config['root_id'],
-            schema=config['schema_version_choices']['1.1'][1] + 'release-schema.json',
-            disable_local_refs=config['flatten_tool']['disable_local_refs'],
-            remove_empty_schema_columns=config['flatten_tool']['remove_empty_schema_columns'],
+            main_sheet_name='releases',  # root_list_path
+            root_list_path='releases',  # root_list_path
+            root_id='ocid',  # root_id
+            schema='https://standard.open-contracting.org/1.1/en/release-schema.json',  # schema_version_choices
+            disable_local_refs=True,  # flatten_tool.disable_local_refs
+            remove_empty_schema_columns=True,  # flatten_tool.remove_empty_schema_columns
             root_is_list=False,
             output_format='xlsx',
         )

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='ocdskingfishercolab',
-    version='0.3.7',
+    version='0.3.8',
     author='Open Contracting Partnership',
     author_email='data@open-contracting.org',
     url='https://github.com/open-contracting/kingfisher-colab',
@@ -23,7 +23,6 @@
         'gspread-dataframe',
         'ipython',
         'ipython-sql~=0.4.0',  # Google Colaboratory uses 0.3.x
-        'libcoveocds',
         'notebook',
         'oauth2client',
         'pydrive2',