Merge 59c746c into ae9642f

.codeclimate.yml

@@ -14,10 +14,52 @@ engines:
     checks:
       E501:
         enabled: false
-
+      E203:
+        enbled: false
+      W503:
+        enabed: false
 ratings:
   paths:
   - "**.py"
 
 exclude_paths:
-- tests/
+# - tests/
+- data/
+- precision/
+- venv/
+- plots/
+
+# Change check defaults
+# https://docs.codeclimate.com/docs/advanced-configuration#section-default-check-configurations
+version: "2"         # required to adjust maintainability checks
+checks:
+  argument-count:
+    config:
+      threshold: 6
+  complex-logic:
+    config:
+      threshold: 4
+  file-lines:
+    config:
+      threshold: 400
+  method-complexity:
+    config:
+      threshold: 10
+  method-count:
+    config:
+      threshold: 20
+  method-lines:
+    config:
+      threshold: 50
+  nested-control-flow:
+    config:
+      threshold: 4
+  return-statements:
+    config:
+      threshold: 4
+ # similar-code:
+ #   config:
+ #     threshold: # language-specific defaults. an override will affect all languages.
+ # identical-code:
+ #   config:
+ #     threshold: # language-specific defaults. an override will affect all languages.

.coveragerc

@@ -4,3 +4,6 @@ branch=True
 omit =
      # Omit large plotting function.
      eniric/plotting_functions.py
+     data/*
+     plots/*
+     precision/*

.shippable.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-    - 3.5
     - 3.6
     - 3.7
 

.travis.yml

@@ -1,7 +1,9 @@
+dist: xenial
+sudo: true
 language: python
 python:
-    - "3.5"
-    - "3.6"
+    - 3.6
+    - 3.7
 
 before_install:
   # http://conda.pydata.org/docs/travis.html

appveyor.yml

@@ -1,12 +1,9 @@
 environment:
-
   matrix:
     # For Python versions available on Appveyor, see
     # http://www.appveyor.com/docs/installed-software#python
-    - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python37"
-    - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
     - PYTHON: "C:\\Python37-x64"
 

conftest.py

@@ -1,5 +1,7 @@
 import os
 
+import astropy.units as u
+import numpy as np
 import pandas as pd
 import pytest
 
@@ -67,3 +69,48 @@ def resampled_data(request):
     )
     wav, flux = pdread_2col(test_data)
     return id_string, wav, flux
+
+
+# Define some fixtures for Qcalculator.
+per_s_cm2 = (1 / u.second) / (u.centimeter ** 2)
+
+
+@pytest.fixture(
+    params=[
+        (np.arange(1, 101), np.random.random(100), None),
+        (np.linspace(2.1, 2.5, 200), np.random.random(200), np.random.random(200)),
+        (
+            np.linspace(0.5, 1.5, 50),
+            np.random.random(50),
+            np.floor(2 * np.random.random(50)),
+        ),
+    ]
+)
+def test_spec(request):
+    """Wave and flux, mask examples."""
+    return request.param
+
+
+# 3 situations each variable, no unit. a unit. or a dimensionless unscaled unit.
+@pytest.fixture(params=[1, u.micron, u.dimensionless_unscaled])
+def wav_unit(request):
+    """Iterate some units on wavelength."""
+    return request.param
+
+
+@pytest.fixture(params=[1, per_s_cm2, u.dimensionless_unscaled])
+def flux_unit(request):
+    """Iterate some units on flux"""
+    return request.param
+
+
+@pytest.fixture(params=[1, u.dimensionless_unscaled])
+def trans_unit(request):
+    """Iterate some units on mask/transmission."""
+    return request.param
+
+
+@pytest.fixture(params=[True, False])
+def grad_flag(request):
+    """Gradient flag parameter."""
+    return request.param

docs/Notebooks/Molecfit_reference.ipynb

@@ -565,7 +565,7 @@
     "plt.plot(wl_input, mweight, 'r-', label='mweight')\n",
     "#plt.plot(wl_input, input_flux, 'k-', label='input data')\n",
     "plt.xlabel('Wavelength (microns and vacuum)')\n",
-    "plt.ylabel('Weigth')\n",
+    "plt.ylabel('weight')\n",
     "plt.title(\"\")\n",
     "plt.legend()\n",
     "plt.show()\n",
@@ -576,7 +576,7 @@
     "plt.plot(wl_input2, mweight2, 'r-', label='mweight2')\n",
     "#plt.plot(wl_input, input_flux, 'k-', label='input data')\n",
     "plt.xlabel('Wavelength (microns and vacuum)')\n",
-    "plt.ylabel('Weigth')\n",
+    "plt.ylabel('Weight')\n",
     "plt.title(\"\")\n",
     "plt.legend()\n",
     "plt.show()\n",