Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLN: Consolidate Dependencies #53863

Merged
merged 8 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,11 @@ default_stages: [
ci:
autofix_prs: false
repos:
- repo: local
- repo: https://github.com/hauntsaninja/black-pre-commit-mirror
# black compiled with mypyc
rev: 23.3.0
hooks:
# NOTE: we make `black` a local hook because if it's installed from
# PyPI (rather than from source) then it'll run twice as fast thanks to mypyc
- id: black
name: black
description: "Black: The uncompromising Python code formatter"
entry: black
language: python
require_serial: true
types_or: [python, pyi]
additional_dependencies: [black==23.3.0]
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.270
hooks:
Expand Down Expand Up @@ -74,7 +67,7 @@ repos:
--linelength=88,
'--filter=-readability/casting,-runtime/int,-build/include_subdir,-readability/fn_size'
]
- repo: https://github.com/pycqa/pylint
- repo: https://github.com/pylint-dev/pylint
rev: v3.0.0a6
hooks:
- id: pylint
Expand All @@ -93,11 +86,6 @@ repos:
|^pandas/conftest\.py # keep excluded
args: [--disable=all, --enable=redefined-outer-name]
stages: [manual]
- id: pylint
alias: unspecified-encoding
name: Using open without explicitly specifying an encoding
args: [--disable=all, --enable=unspecified-encoding]
stages: [manual]
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
Expand Down
14 changes: 5 additions & 9 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies:
- lxml>=4.8.0
- matplotlib>=3.6.1
- numba>=0.55.2
- numexpr>=2.8.0 # pin for "Run checks on imported code" job
- numexpr>=2.8.0
- openpyxl>=3.0.10
- odfpy>=1.4.1
- py
Expand Down Expand Up @@ -76,14 +76,10 @@ dependencies:
- cxx-compiler

# code checks
- black=23.3.0
- cpplint
- flake8=6.0.0
- isort>=5.2.1 # check that imports are in the right order
- mypy=1.2
- flake8=6.0.0 # run in subprocess over docstring examples
- mypy=1.2 # pre-commit uses locally installed mypy
- tokenize-rt # scripts/check_for_inconsistent_pandas_namespace.py
- pre-commit>=2.15.0
- pyupgrade
- ruff=0.0.215

# documentation
- gitpython # obtain contributors from git for whatsnew
Expand Down Expand Up @@ -119,6 +115,6 @@ dependencies:
- pygments # Code highlighting

- pip:
- sphinx-toggleprompt
- sphinx-toggleprompt # conda-forge version has stricter pins on jinja2
- typing_extensions; python_version<"3.11"
- tzdata>=2022.1
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ exclude = [
".eggs/*.py",
# vendored files
"pandas/util/version/*",
"versioneer.py",
# exclude asv benchmark environments from linting
"env",
]
Expand Down Expand Up @@ -445,7 +444,6 @@ disable = [
"super-init-not-called",
"try-except-raise",
"unnecessary-lambda",
"unspecified-encoding",
"unused-argument",
"unused-variable",
"using-constant-test"
Expand Down
6 changes: 1 addition & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,10 @@ seaborn
moto
flask
asv>=0.5.1
black==23.3.0
cpplint
flake8==6.0.0
isort>=5.2.1
mypy==1.2
tokenize-rt
pre-commit>=2.15.0
pyupgrade
ruff==0.0.215
gitpython
gitdb
natsort
Expand Down