diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66003c9c8..08ebc23f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,13 +26,15 @@ jobs: - name: Cache venv uses: actions/cache@v2 with: - path: ~/.local/share/virtualenvs - key: ${{ runner.os }}-build-${{ matrix.python }}-${{ hashFiles('poetry.lock') }} + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-build-${{ matrix.python }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('poetry.lock') }} - name: Install dependencies run: | + echo "Cache Version ${{ secrets.CACHE_VERSION }}" pip install poetry poetry install + poetry config --list - name: Print tool versions run: | @@ -48,7 +50,7 @@ jobs: run: poetry run mypy dataprep - name: Test the project - run: poetry run pytest --cov=dataprep dataprep/tests + run: poetry run pytest --cov-report xml --cov=dataprep dataprep/tests env: DATAPREP_BROWSER_TESTS: 0 DATAPREP_CREDENTIAL_TESTS: 0 @@ -78,13 +80,13 @@ jobs: - name: Install dependencies run: | pip install poetry - poetry config virtualenvs.in-project true + 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 - name: Cache venv uses: actions/cache@v2 with: - path: ~/.local/share/virtualenvs - key: ${{ runner.os }}-build-${{ matrix.python }}-${{ hashFiles('poetry.lock') }} + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-build-${{ matrix.python }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('poetry.lock') }} - name: Install dependencies run: | diff --git a/poetry.toml b/poetry.toml deleted file mode 100644 index ab1033bd3..000000000 --- a/poetry.toml +++ /dev/null @@ -1,2 +0,0 @@ -[virtualenvs] -in-project = true diff --git a/pyproject.toml b/pyproject.toml index b2231bc73..31c9a0aab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,91 +1,89 @@ [tool.poetry] -name = "dataprep" -version = "0.3.0" -description = "Dataprep: Data Preparation in Python" authors = ["SFU Database System Lab "] +description = "Dataprep: Data Preparation in Python" maintainers = [ - "Weiyuan Wu ", - "Jinglin Peng ", - "Pei Wang ", - "Brandon Lockhart ", - "Song Bian " + "Weiyuan Wu ", + "Jinglin Peng ", + "Pei Wang ", + "Brandon Lockhart ", + "Song Bian ", ] +name = "dataprep" +version = "0.3.0" license = "MIT" -readme = "README.md" # Markdown files are supported +readme = "README.md" # Markdown files are supported -repository = "https://github.com/sfu-db/dataprep" homepage = "https://github.com/sfu-db/dataprep" +repository = "https://github.com/sfu-db/dataprep" keywords = ["dataprep", "eda", "connector", "data science", "exploratory data analysis", "data exploration"] classifiers = [ - "Development Status :: 4 - Beta", - "Topic :: Software Development :: Build Tools", - "Environment :: Console", - "Operating System :: OS Independent", - "Intended Audience :: Science/Research", - "Intended Audience :: Developers", - "Intended Audience :: Financial and Insurance Industry", - "Intended Audience :: Healthcare Industry", - "Topic :: Scientific/Engineering", - "Framework :: IPython", + "Development Status :: 4 - Beta", + "Topic :: Software Development :: Build Tools", + "Environment :: Console", + "Operating System :: OS Independent", + "Intended Audience :: Science/Research", + "Intended Audience :: Developers", + "Intended Audience :: Financial and Insurance Industry", + "Intended Audience :: Healthcare Industry", + "Topic :: Scientific/Engineering", + "Framework :: IPython", ] [tool.poetry.dependencies] python = "^3.6.1" # Dependencies for EDA -dask = { version = "^2.25", extras = [ "array", "dataframe", "delayed" ]} -pandas = "^1.1" -numpy = "^1" -scipy = "^1" bokeh = "^2" +bottleneck = "^1.3" +dask = {version = "^2.25", extras = ["array", "dataframe", "delayed"]} nltk = "^3.5" +numpy = "^1" +pandas = "^1.1" +scipy = "^1" wordcloud = "^1.8" -bottleneck = "^1.3" # Dependencies for Connector +aiohttp = "^3.6" +ipywidgets = "^7.5" jinja2 = "^2.11" -tqdm = "^4.48" jsonpath-ng = "^1.5" -aiohttp = "^3.6" pydantic = "^1.6" -ipywidgets = "^7.5" +tqdm = "^4.48" # Dependencies for Clean -regex = "^2020.10.15" -usaddress = "^0.5.10" levenshtein = "^0.12.0" metaphone = "^0.6" -varname = "^0.8.1" python-stdnum = "^1.16" +regex = "^2020.10.15" +usaddress = "^0.5.10" +varname = "^0.8.1" [tool.poetry.dev-dependencies] -pylint = "^2.4" -pytest = "^5.4" -mypy = "^0.770" black = "^20.8b1" -nbsphinx = "^0.7" -sphinx = "^3" -toml = "^0.10.0" -rstcheck = "^3.3.1" -sphinx-autobuild = "^0.7.1" -pytest-cov = "^2.10" codecov = "^2.1" -sphinx-autodoc-typehints = "^1.10" -ipython = "^7.13" -rope = "^0.16" -seaborn = "^0.10.1" +docopt = "^0.6.2" gitpython = "^3.1" ipykernel = "^5.3" -docopt = "^0.6.2" +ipython = "^7.13" +mypy = "^0.770" +nbsphinx = "^0.7" +pylint = "^2.4" +pytest = "^5.4" +pytest-cov = "^2.10" python-semantic-release = "^7.3" +rope = "^0.16" +rstcheck = "^3.3.1" +seaborn = "^0.10.1" +sphinx = "^3" +sphinx-autobuild = "^0.7.1" +sphinx-autodoc-typehints = "^1.10" +toml = "^0.10.0" [tool.black] -line-length = 100 -target-version = ['py36', 'py37'] exclude = ''' ( /( @@ -98,16 +96,18 @@ exclude = ''' )/ ) ''' +line-length = 100 +target-version = ['py36', 'py37'] [tool.semantic_release] -version_variable = "dataprep/__init__.py:__version__" -version_source = "tag" -commit_subject = "v{version}" -commit_message = "Bump to v{version}" -commit_author = "Weiyuan Wu " branch = "master" +commit_author = "Weiyuan Wu " +commit_message = "Bump to v{version}" +commit_subject = "v{version}" commit_version_number = true +version_source = "tag" +version_variable = "dataprep/__init__.py:__version__" [build-system] -requires = ["poetry>=1"] build-backend = "poetry.masonry.api" +requires = ["poetry>=1"]