From 2ead22e9a180cde83f13e26afaa37cafe4d78d2a Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 14 Jul 2022 10:10:05 +0800 Subject: [PATCH 1/9] Simplify environment --- environment-dev.yml | 75 +++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 43 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index 215f19755..ece6c0603 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -2,54 +2,43 @@ name: pyjanitor-dev channels: - conda-forge dependencies: - - python=3.9 + - python>=3.6 + # required + - pandas + - pandas-flavor + - multipledispatch + - scipy + # optional - biopython - - black=22.1.0 - - bump2version=1.0.1 - - cairo - - conda - - darglint - - doc8 - - flake8 + - natsort + - pyspark>=3.2.0 + - rdkit + - tqdm + - unyt + - xarray + # io + - openpyxl + - xlrd + + # testing + - pytest + - pytest-cov + - pytest-xdist - hypothesis + - pandas-vet - interrogate - - ipykernel - - ipython + + # dev tools + - pip-compile + - pre-commit + - pylint - isort - - jinja2<3.1.0 # 27 March 2022: https://github.com/pallets/jinja/issues/1631 - - jupyterlab - - lxml - make + # release + - twine + + # doc build - mkdocs - mkdocs-material - mkdocstrings<0.18.0 - - missingno - - multipledispatch - - mypy - - natsort - - numpy - - openpyxl - - pandas-flavor - - pandas-vet - - pandas=1.3.5 - - pip - - pipreqs - - pip-tools - - pre-commit - - pyflakes - - pylint - - pyspark>=3.2.0 - - pytest - - pytest-cov - - pytest-xdist - - python-language-server - - rdkit=2021.09.3 - - recommonmark - - seaborn - - twine - - unyt - - xarray - - xlrd - - xorg-libxrender - - pip: - - mknotebooks + - ipython From e43d6e7658e09da68ea590d29a932c536457bc6d Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 14 Jul 2022 10:20:54 +0800 Subject: [PATCH 2/9] should be `pip-tools` --- environment-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index ece6c0603..0ad8f9212 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -29,7 +29,7 @@ dependencies: - interrogate # dev tools - - pip-compile + - pip-tools - pre-commit - pylint - isort From 7e248f64a161a840bb259e6f844599fadee2fdd3 Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 14 Jul 2022 10:27:20 +0800 Subject: [PATCH 3/9] Add blank lines --- environment-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment-dev.yml b/environment-dev.yml index 0ad8f9212..96c496f19 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -8,6 +8,7 @@ dependencies: - pandas-flavor - multipledispatch - scipy + # optional - biopython - natsort From 22a90239ce7a81af64cc49ad977e15420595ba72 Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 14 Jul 2022 10:27:54 +0800 Subject: [PATCH 4/9] simplify a bit --- environment-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index 96c496f19..31d315055 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -29,7 +29,7 @@ dependencies: - pandas-vet - interrogate - # dev tools + # dev - pip-tools - pre-commit - pylint From f3f083a7c076c8205f6abd8b8842672520efa09e Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 14 Jul 2022 10:28:50 +0800 Subject: [PATCH 5/9] simplify a bit --- environment-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index 31d315055..31718a24f 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -38,7 +38,7 @@ dependencies: # release - twine - # doc build + # doc - mkdocs - mkdocs-material - mkdocstrings<0.18.0 From 5a956c0740fb689b6eb4f0bb8d8900a07047fefc Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 11 Aug 2022 11:51:28 +0800 Subject: [PATCH 6/9] Remove 'twine' --- environment-dev.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index d339626cf..fc2878e83 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -36,8 +36,6 @@ dependencies: - pylint - isort - make - # release - - twine # doc - mkdocs From a9a607d1fa039d95477d6dbe365d26416185765c Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 11 Aug 2022 11:54:43 +0800 Subject: [PATCH 7/9] keep IDE code style checking package --- environment-dev.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index fc2878e83..a51bfd60e 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -33,9 +33,11 @@ dependencies: # dev - pip-tools - pre-commit + - make + # IDE code style + - black - pylint - isort - - make # doc - mkdocs From 878fc32e16ee7fa486d9a022a51955db3e3c3111 Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 11 Aug 2022 12:23:47 +0800 Subject: [PATCH 8/9] Add 'requests' --- environment-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment-dev.yml b/environment-dev.yml index a51bfd60e..1797e823a 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -18,6 +18,7 @@ dependencies: - unyt - xarray - numba + - requests # io - openpyxl - xlrd From 94effb28993247a98773621b3033c9be7b105f2c Mon Sep 17 00:00:00 2001 From: Zero Date: Thu, 11 Aug 2022 12:25:12 +0800 Subject: [PATCH 9/9] Add marks --- environment-dev.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index 1797e823a..63575cb15 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -7,18 +7,18 @@ dependencies: - pandas - pandas-flavor - multipledispatch - - scipy + - scipy # math, functions # optional - - biopython - - natsort + - natsort # functions + - numba # functions + - biopython # biology + - rdkit # chemistry + - tqdm # chemistry + - unyt # engineering + - requests # finance - pyspark>=3.2.0 - - rdkit - - tqdm - - unyt - xarray - - numba - - requests # io - openpyxl - xlrd