Skip to content

Commit 87e77df

Browse files
committed
build: fix ci
1 parent 42bf188 commit 87e77df

File tree

3 files changed

+61
-61
lines changed

3 files changed

+61
-61
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ jobs:
2626
- name: Cache venv
2727
uses: actions/cache@v2
2828
with:
29-
path: ~/.local/share/virtualenvs
30-
key: ${{ runner.os }}-build-${{ matrix.python }}-${{ hashFiles('poetry.lock') }}
29+
path: ~/.cache/pypoetry/virtualenvs
30+
key: ${{ runner.os }}-build-${{ matrix.python }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('poetry.lock') }}
3131

3232
- name: Install dependencies
3333
run: |
34+
echo "Cache Version ${{ secrets.CACHE_VERSION }}"
3435
pip install poetry
3536
poetry install
37+
poetry config --list
3638
3739
- name: Print tool versions
3840
run: |
@@ -48,7 +50,7 @@ jobs:
4850
run: poetry run mypy dataprep
4951

5052
- name: Test the project
51-
run: poetry run pytest --cov=dataprep dataprep/tests
53+
run: poetry run pytest --cov-report xml --cov=dataprep dataprep/tests
5254
env:
5355
DATAPREP_BROWSER_TESTS: 0
5456
DATAPREP_CREDENTIAL_TESTS: 0
@@ -78,13 +80,13 @@ jobs:
7880
- name: Install dependencies
7981
run: |
8082
pip install poetry
81-
poetry config virtualenvs.in-project true
83+
curl -L https://github.com/jgm/pandoc/releases/download/2.11.2/pandoc-2.11.2-1-amd64.deb -o /tmp/pandoc.deb && sudo dpkg -i /tmp/pandoc.deb
8284
8385
- name: Cache venv
8486
uses: actions/cache@v2
8587
with:
86-
path: ~/.local/share/virtualenvs
87-
key: ${{ runner.os }}-build-${{ matrix.python }}-${{ hashFiles('poetry.lock') }}
88+
path: ~/.cache/pypoetry/virtualenvs
89+
key: ${{ runner.os }}-build-${{ matrix.python }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('poetry.lock') }}
8890

8991
- name: Install dependencies
9092
run: |

poetry.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

pyproject.toml

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,89 @@
11
[tool.poetry]
2-
name = "dataprep"
3-
version = "0.3.0"
4-
description = "Dataprep: Data Preparation in Python"
52
authors = ["SFU Database System Lab <dsl.cs.sfu@gmail.com>"]
3+
description = "Dataprep: Data Preparation in Python"
64
maintainers = [
7-
"Weiyuan Wu <youngw@sfu.com>",
8-
"Jinglin Peng <jinglin_peng@sfu.ca>",
9-
"Pei Wang <peiw@sfu.ca>",
10-
"Brandon Lockhart <brandon_lockhart@sfu.ca>",
11-
"Song Bian <biansonghz@gmail.com>"
5+
"Weiyuan Wu <youngw@sfu.com>",
6+
"Jinglin Peng <jinglin_peng@sfu.ca>",
7+
"Pei Wang <peiw@sfu.ca>",
8+
"Brandon Lockhart <brandon_lockhart@sfu.ca>",
9+
"Song Bian <biansonghz@gmail.com>",
1210
]
11+
name = "dataprep"
12+
version = "0.3.0"
1313

1414
license = "MIT"
1515

16-
readme = "README.md" # Markdown files are supported
16+
readme = "README.md" # Markdown files are supported
1717

18-
repository = "https://github.com/sfu-db/dataprep"
1918
homepage = "https://github.com/sfu-db/dataprep"
19+
repository = "https://github.com/sfu-db/dataprep"
2020

2121
keywords = ["dataprep", "eda", "connector", "data science", "exploratory data analysis", "data exploration"]
2222

2323
classifiers = [
24-
"Development Status :: 4 - Beta",
25-
"Topic :: Software Development :: Build Tools",
26-
"Environment :: Console",
27-
"Operating System :: OS Independent",
28-
"Intended Audience :: Science/Research",
29-
"Intended Audience :: Developers",
30-
"Intended Audience :: Financial and Insurance Industry",
31-
"Intended Audience :: Healthcare Industry",
32-
"Topic :: Scientific/Engineering",
33-
"Framework :: IPython",
24+
"Development Status :: 4 - Beta",
25+
"Topic :: Software Development :: Build Tools",
26+
"Environment :: Console",
27+
"Operating System :: OS Independent",
28+
"Intended Audience :: Science/Research",
29+
"Intended Audience :: Developers",
30+
"Intended Audience :: Financial and Insurance Industry",
31+
"Intended Audience :: Healthcare Industry",
32+
"Topic :: Scientific/Engineering",
33+
"Framework :: IPython",
3434
]
3535

3636
[tool.poetry.dependencies]
3737
python = "^3.6.1"
3838

3939
# Dependencies for EDA
40-
dask = { version = "^2.25", extras = [ "array", "dataframe", "delayed" ]}
41-
pandas = "^1.1"
42-
numpy = "^1"
43-
scipy = "^1"
4440
bokeh = "^2"
41+
bottleneck = "^1.3"
42+
dask = {version = "^2.25", extras = ["array", "dataframe", "delayed"]}
4543
nltk = "^3.5"
44+
numpy = "^1"
45+
pandas = "^1.1"
46+
scipy = "^1"
4647
wordcloud = "^1.8"
47-
bottleneck = "^1.3"
4848

4949
# Dependencies for Connector
50+
aiohttp = "^3.6"
51+
ipywidgets = "^7.5"
5052
jinja2 = "^2.11"
51-
tqdm = "^4.48"
5253
jsonpath-ng = "^1.5"
53-
aiohttp = "^3.6"
5454
pydantic = "^1.6"
55-
ipywidgets = "^7.5"
55+
tqdm = "^4.48"
5656

5757
# Dependencies for Clean
58-
regex = "^2020.10.15"
59-
usaddress = "^0.5.10"
6058
levenshtein = "^0.12.0"
6159
metaphone = "^0.6"
62-
varname = "^0.8.1"
6360
python-stdnum = "^1.16"
61+
regex = "^2020.10.15"
62+
usaddress = "^0.5.10"
63+
varname = "^0.8.1"
6464

6565
[tool.poetry.dev-dependencies]
66-
pylint = "^2.4"
67-
pytest = "^5.4"
68-
mypy = "^0.770"
6966
black = "^20.8b1"
70-
nbsphinx = "^0.7"
71-
sphinx = "^3"
72-
toml = "^0.10.0"
73-
rstcheck = "^3.3.1"
74-
sphinx-autobuild = "^0.7.1"
75-
pytest-cov = "^2.10"
7667
codecov = "^2.1"
77-
sphinx-autodoc-typehints = "^1.10"
78-
ipython = "^7.13"
79-
rope = "^0.16"
80-
seaborn = "^0.10.1"
68+
docopt = "^0.6.2"
8169
gitpython = "^3.1"
8270
ipykernel = "^5.3"
83-
docopt = "^0.6.2"
71+
ipython = "^7.13"
72+
mypy = "^0.770"
73+
nbsphinx = "^0.7"
74+
pylint = "^2.4"
75+
pytest = "^5.4"
76+
pytest-cov = "^2.10"
8477
python-semantic-release = "^7.3"
78+
rope = "^0.16"
79+
rstcheck = "^3.3.1"
80+
seaborn = "^0.10.1"
81+
sphinx = "^3"
82+
sphinx-autobuild = "^0.7.1"
83+
sphinx-autodoc-typehints = "^1.10"
84+
toml = "^0.10.0"
8585

8686
[tool.black]
87-
line-length = 100
88-
target-version = ['py36', 'py37']
8987
exclude = '''
9088
(
9189
/(
@@ -98,16 +96,18 @@ exclude = '''
9896
)/
9997
)
10098
'''
99+
line-length = 100
100+
target-version = ['py36', 'py37']
101101

102102
[tool.semantic_release]
103-
version_variable = "dataprep/__init__.py:__version__"
104-
version_source = "tag"
105-
commit_subject = "v{version}"
106-
commit_message = "Bump to v{version}"
107-
commit_author = "Weiyuan Wu <youngw@sfu.ca>"
108103
branch = "master"
104+
commit_author = "Weiyuan Wu <youngw@sfu.ca>"
105+
commit_message = "Bump to v{version}"
106+
commit_subject = "v{version}"
109107
commit_version_number = true
108+
version_source = "tag"
109+
version_variable = "dataprep/__init__.py:__version__"
110110

111111
[build-system]
112-
requires = ["poetry>=1"]
113112
build-backend = "poetry.masonry.api"
113+
requires = ["poetry>=1"]

0 commit comments

Comments
 (0)