From 20b13419c6e217f14e680c9d3068c69d94fb4157 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 8 Nov 2022 12:10:55 +0000 Subject: [PATCH] requirements: Remove ofdskit - functionality is in latest libcoveofds --- cove_ofds/process.py | 2 +- requirements.in | 1 - requirements.txt | 4 +--- requirements_dev.txt | 4 +--- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cove_ofds/process.py b/cove_ofds/process.py index 353f076..a632dac 100644 --- a/cove_ofds/process.py +++ b/cove_ofds/process.py @@ -4,10 +4,10 @@ import flattentool from libcoveofds.additionalfields import AdditionalFields +from libcoveofds.geojson import GeoJSONToJSONConverter, JSONToGeoJSONConverter from libcoveofds.jsonschemavalidate import JSONSchemaValidator from libcoveofds.python_validate import PythonValidate from libcoveofds.schema import OFDSSchema -from ofdskit.lib.geojson import GeoJSONToJSONConverter, JSONToGeoJSONConverter from libcoveweb2.models import SuppliedDataFile from libcoveweb2.process import ProcessDataTask diff --git a/requirements.in b/requirements.in index 9bc185a..06e33d7 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,6 @@ sentry-sdk Django>3.2,<3.3 libcoveofds -ofdskit gunicorn flattentool django-bootstrap3 diff --git a/requirements.txt b/requirements.txt index 42cae35..86fd91b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,14 +48,12 @@ jsonref==0.2 # libcoveofds jsonschema==4.17.0 # via libcoveofds -libcoveofds==0.2.0 +libcoveofds==0.3.0 # via -r requirements.in lxml==4.9.1 # via flattentool odfpy==1.4.1 # via flattentool -ofdskit==0.1.0 - # via -r requirements.in openpyxl==3.0.10 # via flattentool persistent==4.9.1 diff --git a/requirements_dev.txt b/requirements_dev.txt index a6a2b24..fde2aa7 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -93,7 +93,7 @@ jsonschema==4.17.0 # via # -r requirements.txt # libcoveofds -libcoveofds==0.2.0 +libcoveofds==0.3.0 # via -r requirements.txt libsass==0.21.0 # via -r requirements_dev.in @@ -109,8 +109,6 @@ odfpy==1.4.1 # via # -r requirements.txt # flattentool -ofdskit==0.1.0 - # via -r requirements.txt openpyxl==3.0.10 # via # -r requirements.txt