From ba736cbcc0c66c188667685be3e9b284e4ca17b5 Mon Sep 17 00:00:00 2001 From: rosmesquit <49317687+rosmesquit@users.noreply.github.com> Date: Wed, 24 Mar 2021 14:35:22 -0300 Subject: [PATCH 1/6] update pre-commit --- .github/workflows/pre-commit.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index b3065e1..8d40798 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,5 +11,4 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - - uses: pre-commit/action@v2.0.0 - \ No newline at end of file + - uses: pre-commit/action@v2.0.0 \ No newline at end of file From 13663968932407a69106480c01ca9399e13eac2c Mon Sep 17 00:00:00 2001 From: rosmesquit <49317687+rosmesquit@users.noreply.github.com> Date: Wed, 24 Mar 2021 15:31:46 -0300 Subject: [PATCH 2/6] create pre-commit-config pre-commit-config --- .github/workflows/.pre-commit-config.yaml | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/.pre-commit-config.yaml diff --git a/.github/workflows/.pre-commit-config.yaml b/.github/workflows/.pre-commit-config.yaml new file mode 100644 index 0000000..179e6fd --- /dev/null +++ b/.github/workflows/.pre-commit-config.yaml @@ -0,0 +1,46 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.4.0 + hooks: + - id: check-ast + - id: end-of-file-fixer + exclude: github_deploy_key_wesleybowman_utide.enc + - id: check-docstring-first + - id: check-added-large-files + - id: requirements-txt-fixer + - id: file-contents-sorter + files: requirements-dev.txt + - id: trailing-whitespace + - id: debug-statements + +- repo: https://gitlab.com/pycqa/flake8 + rev: 3.8.4 + hooks: + - id: flake8 + exclude: docs/source/conf.py + args: [--max-line-length=105] + +- repo: https://github.com/pre-commit/mirrors-isort + rev: v5.7.0 + hooks: + - id: isort + additional_dependencies: [toml] + args: [--project=utide, --multi-line=3, --lines-after-imports=2, --lines-between-types=1, --trailing-comma, --force-grid-wrap=0, --use-parentheses, --line-width=88] + +- repo: https://github.com/psf/black + rev: 20.8b1 + hooks: + - id: black + language_version: python3 + +- repo: https://github.com/asottile/pyupgrade + rev: v2.10.0 + hooks: + - id: pyupgrade + args: + - --py36-plus + +- repo: https://github.com/asottile/add-trailing-comma + rev: v2.1.0 + hooks: + - id: add-trailing-comma \ No newline at end of file From 517b227617f7c94e8ce91eea20251645c30ecc7d Mon Sep 17 00:00:00 2001 From: rosmesquit <49317687+rosmesquit@users.noreply.github.com> Date: Wed, 24 Mar 2021 17:35:13 -0300 Subject: [PATCH 3/6] Delete .pre-commit-config.yaml --- .github/workflows/.pre-commit-config.yaml | 46 ----------------------- 1 file changed, 46 deletions(-) delete mode 100644 .github/workflows/.pre-commit-config.yaml diff --git a/.github/workflows/.pre-commit-config.yaml b/.github/workflows/.pre-commit-config.yaml deleted file mode 100644 index 179e6fd..0000000 --- a/.github/workflows/.pre-commit-config.yaml +++ /dev/null @@ -1,46 +0,0 @@ -repos: -- repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.4.0 - hooks: - - id: check-ast - - id: end-of-file-fixer - exclude: github_deploy_key_wesleybowman_utide.enc - - id: check-docstring-first - - id: check-added-large-files - - id: requirements-txt-fixer - - id: file-contents-sorter - files: requirements-dev.txt - - id: trailing-whitespace - - id: debug-statements - -- repo: https://gitlab.com/pycqa/flake8 - rev: 3.8.4 - hooks: - - id: flake8 - exclude: docs/source/conf.py - args: [--max-line-length=105] - -- repo: https://github.com/pre-commit/mirrors-isort - rev: v5.7.0 - hooks: - - id: isort - additional_dependencies: [toml] - args: [--project=utide, --multi-line=3, --lines-after-imports=2, --lines-between-types=1, --trailing-comma, --force-grid-wrap=0, --use-parentheses, --line-width=88] - -- repo: https://github.com/psf/black - rev: 20.8b1 - hooks: - - id: black - language_version: python3 - -- repo: https://github.com/asottile/pyupgrade - rev: v2.10.0 - hooks: - - id: pyupgrade - args: - - --py36-plus - -- repo: https://github.com/asottile/add-trailing-comma - rev: v2.1.0 - hooks: - - id: add-trailing-comma \ No newline at end of file From f987986097546dc39443428f302e00edf646551f Mon Sep 17 00:00:00 2001 From: rosmesquit <49317687+rosmesquit@users.noreply.github.com> Date: Wed, 24 Mar 2021 17:39:02 -0300 Subject: [PATCH 4/6] Create .pre-commit-config.yaml --- .pre-commit-config.yaml | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..179e6fd --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,46 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.4.0 + hooks: + - id: check-ast + - id: end-of-file-fixer + exclude: github_deploy_key_wesleybowman_utide.enc + - id: check-docstring-first + - id: check-added-large-files + - id: requirements-txt-fixer + - id: file-contents-sorter + files: requirements-dev.txt + - id: trailing-whitespace + - id: debug-statements + +- repo: https://gitlab.com/pycqa/flake8 + rev: 3.8.4 + hooks: + - id: flake8 + exclude: docs/source/conf.py + args: [--max-line-length=105] + +- repo: https://github.com/pre-commit/mirrors-isort + rev: v5.7.0 + hooks: + - id: isort + additional_dependencies: [toml] + args: [--project=utide, --multi-line=3, --lines-after-imports=2, --lines-between-types=1, --trailing-comma, --force-grid-wrap=0, --use-parentheses, --line-width=88] + +- repo: https://github.com/psf/black + rev: 20.8b1 + hooks: + - id: black + language_version: python3 + +- repo: https://github.com/asottile/pyupgrade + rev: v2.10.0 + hooks: + - id: pyupgrade + args: + - --py36-plus + +- repo: https://github.com/asottile/add-trailing-comma + rev: v2.1.0 + hooks: + - id: add-trailing-comma \ No newline at end of file From 796cb2268217c7aed65bb433b38a3d30b015fc6a Mon Sep 17 00:00:00 2001 From: rosmesquit <49317687+rosmesquit@users.noreply.github.com> Date: Tue, 30 Mar 2021 13:57:40 -0300 Subject: [PATCH 5/6] conda test Testing PR @rosmesquit --- .github/workflows/Conda-test.yml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/Conda-test.yml diff --git a/.github/workflows/Conda-test.yml b/.github/workflows/Conda-test.yml new file mode 100644 index 0000000..7103191 --- /dev/null +++ b/.github/workflows/Conda-test.yml @@ -0,0 +1,37 @@ +name: Tests + +on: + pull_request: + push: + branches: [master] + +jobs: + run: + runs-on: ${{ matrix.os }} + strategy: + matrix: + python-version: ["3.7", "3.8", "3.9"] + os: [windows-latest, ubuntu-latest, macos-latest] + + steps: + - uses: actions/checkout@v2 + + - name: Setup Conda + uses: s-weigand/setup-conda@v1 + with: + activate-conda: false + conda-channels: conda-forge + + - name: Python ${{ matrix.python-version }} + shell: bash -l {0} + run: | + conda create --name TEST python=${{ matrix.python-version }} --file requirements.txt --file requirements-dev.txt + source activate TEST + pip install -e . --no-deps --force-reinstall + conda info --all + conda list + - name: Tests + shell: bash -l {0} + run: | + source activate TEST + pytest -rxs --cov=oceans --vcr-record=none tests \ No newline at end of file From f7a3b19818af91c5ddb03edf11eb33120d4060bb Mon Sep 17 00:00:00 2001 From: rosmesquit <49317687+rosmesquit@users.noreply.github.com> Date: Thu, 1 Apr 2021 20:45:35 -0300 Subject: [PATCH 6/6] Update @rosmesquit UP --- .github/workflows/{Conda-test.yml => TESTS.yml} | 5 ++--- .github/workflows/pre-commit.yml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) rename .github/workflows/{Conda-test.yml => TESTS.yml} (89%) diff --git a/.github/workflows/Conda-test.yml b/.github/workflows/TESTS.yml similarity index 89% rename from .github/workflows/Conda-test.yml rename to .github/workflows/TESTS.yml index 7103191..8bbc705 100644 --- a/.github/workflows/Conda-test.yml +++ b/.github/workflows/TESTS.yml @@ -30,8 +30,7 @@ jobs: pip install -e . --no-deps --force-reinstall conda info --all conda list + - name: Tests shell: bash -l {0} - run: | - source activate TEST - pytest -rxs --cov=oceans --vcr-record=none tests \ No newline at end of file + run: \ No newline at end of file diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 8d40798..e356c37 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -4,11 +4,11 @@ on: pull_request: push: branches: [master] - + jobs: pre-commit: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - - uses: pre-commit/action@v2.0.0 \ No newline at end of file + \ No newline at end of file