Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Point to main branch on GH/workflows #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 19, 2024
Merged

Point to main branch on GH/workflows #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c5f983f
update to `main`
Mikejmnez Jul 19, 2024
b1dc486
fix typo
Mikejmnez Jul 19, 2024
5f5cb02
these dependencies are already set to be installed in `pyproject.toml`
Mikejmnez Jul 19, 2024
93c5f8e
need to install setuptool to use `pgk_resources`
Mikejmnez Jul 19, 2024
b8088a7
pre-commit white space
Mikejmnez Jul 19, 2024
9429025
remove conda command - conda not being used yet
Mikejmnez Jul 19, 2024
2512c16
pre-commit
Mikejmnez Jul 19, 2024
7b9c003
fix typo!
Mikejmnez Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ The following Pull Request:

- [ ] Closes an already existing opened issue #xxxx for fixing a bug, requesting
a new feature, etc.
- [ ] Tests are added to demostrate the new or fixed behavior, and all tests pass
- [ ] Tests are added to demonstrate the new or fixed behavior, and all tests pass
on a local environment.
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pre-commit
on:
pull_request:
push:
branches: [master]
branches: [main]

jobs:
pre-commit:
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/run_tests_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Run Python Tests on MacOS
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand All @@ -25,11 +25,10 @@ jobs:
brew install hdf5
- name: Install dependencies
run: |
pip3 install -U pip setuptools
pip3 install -U "werkzeug<2.1"
pip3 install -U numpy webtest gsw coards
pip3 install -U netCDF4 pytest Webob Jinja2 docopt-ng beautifulsoup4 requests testresources
python -m pip install --upgrade pip
python -m pip install -U pip setuptools
pip install -e .[tests,netcdf,client]

- name: Run tests with pytest
run: |
pip install -e .[tests,netcdf,client]
pytest
12 changes: 4 additions & 8 deletions .github/workflows/run_tests_ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Run Python Tests
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
build:
Expand All @@ -23,13 +23,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip3 install -U pip setuptools
pip3 install -U "werkzeug>=2.2.2" cryptography
pip3 install -U numpy webtest gsw coards
pip3 install -U netCDF4 pytest Webob Jinja2 docopt-ng beautifulsoup4 requests testresources
- name: Run tests with pytest
run: |
python -m pip install -U pip setuptools
pip install -e .[tests,netcdf,client]

- name: Run tests with pytest
run: |
pytest
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://pre-commit.com/
ci:
autofix_prs: false
autoupdate_branch: 'master'
autoupdate_branch: 'main'
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
autoupdate_schedule: weekly
skip: []
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ tests = [
'flake8',
'werkzeug>= 2.2.2',
'gunicorn',
'cryptography'
'cryptography',
'gsw',
'coards'
]

[tool.isort]
Expand Down