Skip to content

Commit 0e5e907

Browse files
committed
Merge branch 'develop' into master
2 parents 1ff492c + f8f49c6 commit 0e5e907

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+4824
-5835
lines changed

.codecov.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
codecov:
2+
branch: develop
3+
4+
coverage:
5+
status:
6+
project:
7+
default:
8+
target: 1
9+
patch: false
10+
changes: false
11+
12+
comment: off

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ omit =
33
setup.py
44
tests/*
55
hydrodata/__init__.py
6+
hydrodata/print_versions.py

.deepsource.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version = 1
2+
3+
test_patterns = [
4+
"*/tests/**",
5+
"*/test_*.py"
6+
]
7+
8+
exclude_patterns = [
9+
"docs/**",
10+
"ci/**",
11+
"*/print_versions.py",
12+
]
13+
14+
[[analyzers]]
15+
name = "python"
16+
enabled = true
17+
18+
[analyzers.meta]
19+
runtime_version = "3.x.x"

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Please include a self-contained copy-pastable example that generates the issue if possible.
11+
12+
Please be concise with code posted. See guidelines below on how to provide a good bug report:
13+
14+
- Craft Minimal Bug Reports: http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports
15+
- Minimal Complete Verifiable Examples: https://stackoverflow.com/help/mcve
16+
17+
Bug reports that follow these guidelines are easier to diagnose, and so are often handled much more quickly.
18+
-->
19+
20+
**What happened**:
21+
22+
**What you expected to happen**:
23+
24+
**Minimal Complete Verifiable Example**:
25+
26+
```python
27+
# Put your MCVE code here
28+
```
29+
30+
**Anything else we need to know?**:
31+
32+
**Environment**:
33+
34+
<details><summary>Output of <tt>hydrodata.show_versions()</tt></summary>
35+
36+
<!-- Paste the output here hydrodata.show_versions() here -->
37+
38+
39+
</details>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Please do a quick search of existing issues to make sure that this has not been asked before. -->
11+
12+
**Is your feature request related to a problem? Please describe.**
13+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
14+
15+
**Describe the solution you'd like**
16+
A clear and concise description of what you want to happen.
17+
18+
**Describe alternatives you've considered**
19+
A clear and concise description of any alternative solutions or features you've considered.
20+
21+
**Additional context**
22+
Add any other context about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- Feel free to remove check-list items aren't relevant to your change -->
2+
3+
- [ ] Closes #xxxx
4+
- [ ] Tests added and passed `make coverage`
5+
- [ ] Passes `make lint`
6+
- [ ] User visible changes (including notable bug fixes) are documented in `HISTORY.rst`
7+
- [ ] After adding new functions/methods ran `make apidocs`

.github/workflows/lint.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,14 @@ on: [push, pull_request]
44

55
jobs:
66
run-linters:
7-
name: Run linters
7+
name: Run pre-commit
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- name: Check out Git repository
12-
uses: actions/checkout@v2
13-
14-
- name: Set up Python
15-
uses: actions/setup-python@v1
11+
- uses: actions/checkout@master
12+
- uses: actions/setup-python@master
1613
with:
1714
python-version: 3.8
1815

19-
- name: Install Python dependencies
20-
run: pip install -r ci/requirements/requirements_lint.txt
16+
- uses: pre-commit/[email protected]
2117

22-
- run: isort --recursive --diff hydrodata tests
23-
- run: black --py36 --diff hydrodata tests
24-
- run: pyupgrade --py36-plus
25-
- run: flake8 hydrodata tests

.github/workflows/python-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Upload Python Package
1+
name: pypi publish
22

33
on:
44
release:
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@master
1414
- name: Set up Python
15-
uses: actions/setup-python@v2
15+
uses: actions/setup-python@master
1616
with:
17-
python-version: '3.8'
17+
python-version: 3.8
1818
- name: Install dependencies
1919
run: |
2020
python -m pip install --upgrade pip

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
name: build
1+
name: pytest
22

33
on: [push, pull_request]
44

55
jobs:
66
test:
7-
name: pytest (${{ matrix.python-version }}, ${{ matrix.os }})
7+
name: python ${{ matrix.python-version }}, ${{ matrix.os }}
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
1111
python-version: ["3.6", "3.7", "3.8"]
1212
os: ["ubuntu-latest", "macos-latest"]
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- name: Setup Miniconda
17-
uses: goanpeca/setup-miniconda@v1.5.0
15+
- uses: actions/checkout@master
16+
- name: Setup miniconda
17+
uses: goanpeca/setup-miniconda@v1
1818
with:
1919
activate-environment: hydrodata
2020
python-version: ${{ matrix.python-version }}
2121
environment-file: ci/requirements/py${{ matrix.python-version }}.yml
2222
auto-update-conda: true
2323
auto-activate-base: false
2424

25-
- name: Install Hydrodata
25+
- name: Install hydrodata
2626
shell: bash -l {0}
2727
run: |
2828
conda info
2929
conda list
30-
conda install -y -c conda-forge pytest pytest-runner pytest-cov pytest-xdist codecov
30+
conda install -y -c conda-forge pytest pytest-cov codecov flaky
3131
pip install --no-deps -e .
3232
33-
- name: Run tests
33+
- name: Run pytest
3434
shell: bash -l {0}
3535
run: pytest --cov=hydrodata --cov-report term-missing --cov-report xml --verbose --color=yes
3636

3737
- name: Run codecov
38-
uses: codecov/codecov-action@v1.0.7
38+
uses: codecov/codecov-action@v1

0 commit comments

Comments
 (0)