Merge pull request #203 from open-contracting/cleanup

Cleanup

.github/workflows/lint.yml

@@ -17,8 +17,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-pip-
     - run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
+    - run: sudo apt-get install shellcheck
     - run: pip install -r requirements.txt black==20.8b1
     - run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
+    - run: shellcheck --exclude=SC2029 *.sh
     - run: black --check .
     - run: pip install -r requirements_dev.txt
     - run: STANDARD_MAINTENANCE_SCRIPTS_IGNORE=flower pytest /tmp/test_requirements.py

.gitignore

@@ -37,5 +37,5 @@ static/wagtailvideos/
 #public folders
 media/
 
-
-export/*
+export/*
+erl_crash.dump

country/management/commands/import_tender_excel.py

@@ -17,9 +17,6 @@ def handle(self, *args, **kwargs):
         print(f"Fetching tender data from {excel_file_path} for country {country}")
 
         try:
-            # ws = pd.read_excel(excel_file_path, sheet_name=['data'], header=None)
-            # ws_settings = ws['settings']
-            # '/Users/bigyan/UKRAINIAN DATA COVID_11.12.20.xlsx'
             # Check if country exists in our database
             result = Country.objects.filter(name=country).first()
             country = result.name

country/serializers.py

@@ -418,10 +418,6 @@ def get_equity_category(self, obj):
             result.append(equity.category_name)
         return result
 
-    # def get_red_flag_count(self,obj):
-    #     red_flags = obj.red_flag.all().count()
-    #     return red_flags
-
     def get_supplier_name(self, obj):
         return obj.supplier.supplier_name
 

country/tasks.py

@@ -89,6 +89,8 @@ def convert_local_to_usd(conversion_date, source_currency, source_value, dst_cur
                 f"&symbols={dst_currency}",
                 timeout=20,
             )
+            # A sample response:
+            #
             # {
             #     "success": true,
             #     "timestamp": 1387929599,
@@ -125,11 +127,8 @@ def save_tender_excel_to_db(excel_file_path, country, currency):
     errors = []
 
     try:
-        # ws_settings = pd.read_excel(excel_file_path, sheet_name='settings', header=None)
         ws_data = pd.read_excel(excel_file_path, sheet_name="data", header=0, na_values=None, na_filter=False)
         ws_data = ws_data.where(ws_data.notnull(), None)
-        # country = ws_settings[2][1]
-        # currency = ws_settings[2][2]
         country = country
         currency = currency
     except:
@@ -159,8 +158,6 @@ def save_tender_excel_to_db(excel_file_path, country, currency):
             contract_title = row["Contract title"]
             contract_desc = row["Contract description"]
             no_of_bidders = row["Number of bidders"] or None
-            # if math.isnan(no_of_bidders):
-            #     no_of_bidders = None
 
             buyer_id = row["Buyer ID"]
             buyer_name = row["Buyer"].strip()
@@ -668,12 +665,6 @@ def import_tender_data_excel(excel_file_path, country, currency):
 
 @app.task(name="local_currency_to_usd")
 def local_currency_to_usd(goods_services_row_id, conversion_date, source_currency, source_values):
-    # source_values = {
-    #     'tender_value_local': row['Tender value'],
-    #     'award_value_local': row['Award value'],
-    #     'contract_value_local': row['Contract value']
-    # }
-
     dst_tender_value = convert_local_to_usd(
         conversion_date, source_currency, source_values["tender_value_local"], dst_currency="USD"
     )

country/views.py

@@ -234,10 +234,6 @@ def get(self, request):
         data_import_id = self.request.GET.get("data_import_id", None)
         validated = self.request.GET.get("validated", None)
 
-        # file_path = settings.MEDIA_ROOT+'/documents/'+filename
-        # valid_file_extension = ['.xlsx','.xls',]
-        # file_extension= os.path.splitext(filename)[-1].lower()
-
         if validated:
             if data_import_id:
                 try:

deploy.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 ARG1=${1:-main}
 ARG2=${2:-covid19\-dev}
-ssh covid19-deployer@covid19admin.py.staging.yipl.com.np 'bash -s' < script.sh $ARG1 $ARG2
+ssh covid19-deployer@covid19admin.py.staging.yipl.com.np 'bash -s' < script.sh "$ARG1" "$ARG2"