#234 fix PlantCount card: count_method already in title

Pipfile

@@ -31,11 +31,11 @@ xmltodict = "==0.12.0"
 django-allauth = "==0.42.0"
 dbca-utils = "==1.1.1"
 django-background-tasks = "==1.2.5"
-fabric3 = "==1.14.post1"
+Fabric3 = "==1.14.post1"
 gunicorn = "==20.0.4"
-uwsgi = "==2.0.19.1"
+uWSGI = "==2.0.19.1"
 python-memcached = "*"
-django-confy = "==1.0.4"
+django-confy = ">=1.0.4"
 django-environ = "==0.4.5"
 Unipath = "==1.1"
 pandas = ">=1.0.5"
@@ -96,14 +96,13 @@ pytest-sugar = "*"
 model-mommy = "*"
 graphviz = "*"
 tblib = "*"
-confy = "*"
 
 [dev-packages]
 
 [requires]
 python_version = "3.7"
 
-[packages.django_fixture_magic]
+[packages.django-fixture-magic]
 git = "https://github.com/davedash/django-fixture-magic.git"
 editable = true
 ref = "master"

fabfile.py

@@ -5,12 +5,7 @@
 """
 from fabric.api import env, local  # settings, cd, run
 from fabric.colors import green, yellow  # red
-import confy
 from confy import env as confyenv
-try:
-    confy.read_environment_file(".env")
-except:
-    pass
 
 # from fabric.contrib.files import exists, upload_template
 

manage.py

@@ -6,7 +6,7 @@
 # These lines are required for interoperability between local and container environments.
 dot_env = os.path.join(os.getcwd(), '.env')
 if os.path.exists(dot_env):
-    confy.read_environment_file()
+    confy.read_environment_file(envfile=dot_env)
 
 if __name__ == '__main__':
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.production')
@@ -17,7 +17,7 @@
         # issue is really that Django is missing to avoid masking other
         # exceptions on Python 2.
         try:
-            import django
+            import django  # noqa
         except ImportError:
             raise ImportError(
                 "Couldn't import Django. Are you sure it's installed and "

occurrence/models.py

@@ -1018,12 +1018,6 @@ class PlantCondition(CodeLabelDescriptionMixin, models.Model):
     pass
 
 
-class PlantCountMethod(CodeLabelDescriptionMixin, models.Model):
-    """The count method of a PlantCount."""
-
-    pass
-
-
 class PlantCount(ObservationGroup):
     """Population plant count."""
 

occurrence/templates/occurrence/cards/plantcount.html

@@ -12,11 +12,6 @@ <h6 class="card-title">Plant Count</h6>
       <span class="oi oi-person" aria-hidden="true"></span>
       Land manager {% if not object.land_manager_present %}not {% endif %}present.
     </p>
-    <p class="card-text">
-      <span class="oi oi-magnifying-glass" aria-hidden="true"></span>
-      Count method: {{ object.get_count_method_display }}
-      ({{ object.get_count_subject_display }} {{ object.get_count_accuracy_display }}).
-    </p>
     <p class="card-text">
       <small>
       <div class="row justify-content-end">

requirements/base.txt

@@ -23,7 +23,6 @@ coreapi-cli==1.0.9
 coreschema==0.0.4
 coverage==5.2
 coveralls==2.1.1
-confy==0.3.8
 cryptography==3.0
 dbca-utils==1.1.1
 decorator==4.4.2