Merge branch 'develop'

giocaizzi · Jan 1, 2022 · 51de47b · 51de47b
2 parents 44474d2 + bbf6831
commit 51de47b
Show file tree

Hide file tree

Showing 68 changed files with 2,533 additions and 4,320 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -2,7 +2,7 @@ name: mplStrater
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop]
   pull_request:
     branches: [ main ]
 
@@ -27,11 +27,12 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
+        pip install pytest-cov
         
     - run: |
         pytest --cov=./mplStrater --cov-report=xml
       
     - name: "Upload coverage to Codecov"
       uses: codecov/codecov-action@v2
       with:
-        token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+        token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ docsrc/build
 temp
 dist
 build
+.vscode
+.coverage
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/giocaizzi/mplStrater/mplStrater/main)
 ![Codecov](https://img.shields.io/codecov/c/github/giocaizzi/mplStrater)
 [![Requirements Status](https://requires.io/github/giocaizzi/mplStrater/requirements.svg?branch=main)](https://requires.io/github/giocaizzi/mplStrater/requirements/?branch=main)
-![Licende](https://img.shields.io/github/license/giocaizzi/mplStrater)
+![License](https://img.shields.io/github/license/giocaizzi/mplStrater)
 ![GitHub issues](https://img.shields.io/github/issues/giocaizzi/mplStrater)
 
 This package provides the possibility to plot geologic stratigraphic columns with a structured symbology and labelling system on `matplotlib` figures.

diff --git a/data/example.csv b/data/example.csv
diff --git a/docs/.buildinfo b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: cbc24322d692e083cf9b5a53057ca851
+config: 73265897acd2662c7b0ea3759f8bf3c5
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_images/columns.jpeg b/docs/_images/columns.jpeg
diff --git a/docs/_images/examples_data_9_1.png b/docs/_images/examples_data_9_1.png
diff --git a/docs/_images/examples_strata_7_0.png → docs/_images/examples_strata_11_0.png b/docs/_images/examples_strata_7_0.png → docs/_images/examples_strata_11_0.png
diff --git a/docs/_images/examples_strata_8_0.png b/docs/_images/examples_strata_8_0.png
diff --git a/...mages/examples_stratigraphic_map_11_0.png → ...mages/examples_stratigraphic_map_13_0.png b/...mages/examples_stratigraphic_map_11_0.png → ...mages/examples_stratigraphic_map_13_0.png
diff --git a/...mages/examples_stratigraphic_map_12_0.png → docs/_images/map.png b/...mages/examples_stratigraphic_map_12_0.png → docs/_images/map.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,5 @@ docsrc/build @@
     temp
     dist
     build
+    .vscode
+    .coverage