Skip to content

Commit

Permalink
Merge b42d7c2 into 7c9ecc7
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-neal committed Aug 18, 2018
2 parents 7c9ecc7 + b42d7c2 commit 8de1e04
Show file tree
Hide file tree
Showing 14 changed files with 712 additions and 743 deletions.
46 changes: 44 additions & 2 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 3 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ branch=True
omit =
# Omit large plotting function.
eniric/plotting_functions.py
data/*
plots/*
precision/*
1 change: 0 additions & 1 deletion .shippable.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: python
python:
- 3.5
- 3.6
- 3.7

Expand Down
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions docs/Notebooks/Molecfit_reference.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 8de1e04

Please sign in to comment.