Skip to content

Commit

Permalink
Merge pull request #20 from ocefpaf/fix_test
Browse files Browse the repository at this point in the history
Fix tests
  • Loading branch information
ocefpaf authored May 30, 2024
2 parents 060ecad + 1970eeb commit f479812
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 10 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: Documentation

on:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
os: [windows-latest, ubuntu-latest, macos-latest]
os: [ubuntu-latest]
fail-fast: false

steps:
Expand All @@ -23,7 +23,7 @@ jobs:
environment-name: TEST
init-shell: bash
create-args: >-
python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt --channel conda-forge
python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt octave --channel conda-forge
- name: Install seawater
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: seawater/test/seawater_v3_3/
exclude: seawater/tests/seawater_v3_3/

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# python-seawater

[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11395.svg)](https://doi.org/10.5281/zenodo.11395)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11395.svg)](https://zenodo.org/records/11395)
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/seawater)
[![Tests](https://github.com/pyoceans/python-seawater/actions/workflows/tests.yml/badge.svg)](https://github.com/pyoceans/python-seawater/actions/workflows/tests.yml)
![PyPI - License](https://img.shields.io/pypi/l/seawater)
Expand Down Expand Up @@ -37,6 +37,3 @@ at this that we simply ignore to avoid confusions.

The current version was tested against the Matlab seawater v3.3
reproducing all functions and results from that release.

More information at
[http://pythonhosted.org/seawater](http://pythonhosted.org/seawater).
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.

extensions = [
"myst_parser",
"sphinx.ext.autodoc",
"sphinx.ext.mathjax",
"sphinx.ext.doctest",
Expand Down
5 changes: 3 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
readme_link

Documentation
=============


.. toctree::
:maxdepth: 2

readme_link

eos80
geostrophic
extras
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
matplotlib
myst-parser
numpydoc
oct2py
pytest
Expand Down

0 comments on commit f479812

Please sign in to comment.