Skip to content

Commit ec8ac6a

Browse files
authored
Merge pull request #21 from cmu-delphi/ds/fix-ci
ci: pip command outdated
2 parents 97f434d + 235a546 commit ec8ac6a

File tree

7 files changed

+103
-106
lines changed

7 files changed

+103
-106
lines changed

.github/workflows/ci.yaml

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,37 @@ name: ci
33
on: push
44

55
jobs:
6-
build:
7-
runs-on: ubuntu-latest
8-
strategy:
9-
matrix:
10-
python-version: [3.8]
11-
steps:
12-
- name: Check out code
13-
uses: actions/checkout@v2
14-
- name: Set up Python ${{ matrix.python-version }}
15-
uses: actions/setup-python@v2
16-
with:
17-
python-version: ${{ matrix.python-version }}
18-
- uses: actions/cache@v2
19-
with:
20-
path: ~/.cache/pip
21-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
22-
restore-keys: |
23-
${{ runner.os }}-pip-
24-
- name: Install Dependencies
25-
run: |
26-
python -m venv venv
27-
. venv/bin/activate
28-
python -m pip install --upgrade pip
29-
pip install --use-feature=2020-resolver -r requirements.txt -r requirements-dev.txt
30-
31-
- name: Check Formatting
32-
run: |
33-
. venv/bin/activate
34-
inv lint-black
35-
- name: Check Linting
36-
run: |
37-
. venv/bin/activate
38-
inv lint-pylint
39-
- name: Check Types
40-
run: |
41-
. venv/bin/activate
42-
inv lint-mypy
43-
- name: Test
44-
run: |
45-
. venv/bin/activate
46-
inv test
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
python-version: [3.8]
11+
steps:
12+
- name: Check out code
13+
uses: actions/checkout@v3
14+
- name: Set up Python ${{ matrix.python-version }}
15+
uses: actions/setup-python@v4
16+
with:
17+
python-version: ${{ matrix.python-version }}
18+
cache: "pip"
19+
- name: Install Dependencies
20+
run: |
21+
python -m venv venv
22+
source venv/bin/activate
23+
pip install -r requirements.txt -r requirements-dev.txt
24+
- name: Check Formatting
25+
run: |
26+
source venv/bin/activate
27+
inv lint-black
28+
- name: Check Linting
29+
run: |
30+
source venv/bin/activate
31+
inv lint-pylint
32+
- name: Check Types
33+
run: |
34+
source venv/bin/activate
35+
inv lint-mypy
36+
- name: Test
37+
run: |
38+
source venv/bin/activate
39+
inv test

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ min-public-methods=1
55

66
[MESSAGES CONTROL]
77

8-
disable=R0801, C0330, E1101, E0611, C0114, C0116, C0103, R0913, R0914, W0702, too-many-public-methods, too-many-instance-attributes
8+
disable=R0801, E1101, E0611, C0114, C0116, C0103, R0913, R0914, W0702, too-many-public-methods, too-many-instance-attributes
99

1010
[FORMAT]
1111
max-line-length=120

epidatpy/_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Final
22

33

4-
__version__: Final = "1.0.0"
4+
__version__: Final = "0.5.0"
55

66

77
HTTP_HEADERS: Final = {"User-Agent": f"epidatpy/{__version__}"}

epidatpy/_covidcast.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,17 @@ def call(
169169
raise InvalidArgumentException("`issues` and `lag` are mutually exclusive")
170170

171171
return self._create_call(
172-
dict(
173-
data_source=self.source,
174-
signals=self.signal,
175-
time_type=self.time_type,
176-
time_values=time_values,
177-
geo_type=geo_type,
178-
geo_values=geo_values,
179-
as_of=as_of,
180-
issues=issues,
181-
lag=lag,
182-
)
172+
{
173+
"data_source": self.source,
174+
"signals": self.signal,
175+
"time_type": self.time_type,
176+
"time_values": time_values,
177+
"geo_type": geo_type,
178+
"geo_values": geo_values,
179+
"as_of": as_of,
180+
"issues": issues,
181+
"lag": lag,
182+
}
183183
)
184184

185185
def __call__(

0 commit comments

Comments
 (0)