Merge branch 'master' into subplot_groups

Author: NicolasHug

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
       if: always()
 
     - name: Testing docstring validation script
-      run: pytest --capture=no --strict-markers scripts
+      run: pytest scripts
       if: always()
 
     - name: Running benchmarks

.github/workflows/database.yml

@@ -78,7 +78,7 @@ jobs:
       uses: ./.github/actions/build_pandas
 
     - name: Test
-      run: pytest -m "${{ env.PATTERN }}" -n 2 --dist=loadfile -s --strict-markers --durations=30 --junitxml=test-data.xml -s --cov=pandas --cov-report=xml pandas/tests/io
+      run: pytest -m "${{ env.PATTERN }}" -n 2 --dist=loadfile --cov=pandas --cov-report=xml pandas/tests/io
       if: always()
 
     - name: Build Version

.github/workflows/python-dev.yml

@@ -0,0 +1,70 @@
+name: Python Dev
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: actions-310-dev
+    timeout-minutes: 60
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python Dev Version
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.10-dev'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        pip install git+https://github.com/numpy/numpy.git
+        pip install git+https://github.com/pytest-dev/pytest.git
+        pip install git+https://github.com/nedbat/coveragepy.git
+        pip install cython python-dateutil pytz hypothesis pytest-xdist
+        pip list
+
+    - name: Build Pandas
+      run: |
+        python setup.py build_ext -q -j2
+        python -m pip install -e . --no-build-isolation --no-use-pep517
+
+    - name: Build Version
+      run: |
+        python -c "import pandas; pandas.show_versions();"
+
+    - name: Test with pytest
+      run: |
+        coverage run -m pytest -m 'not slow and not network and not clipboard' pandas
+      continue-on-error: true
+
+    - name: Publish test results
+      uses: actions/upload-artifact@master
+      with:
+        name: Test results
+        path: test-data.xml
+      if: failure()
+
+    - name: Print skipped tests
+      run: |
+        python ci/print_skipped.py
+
+    - name: Report Coverage
+      run: |
+        coverage report -m
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        flags: unittests
+        name: codecov-pandas
+        fail_ci_if_error: true

.gitignore

@@ -104,6 +104,7 @@ asv_bench/env/
 asv_bench/html/
 asv_bench/results/
 asv_bench/pandas/
+test-data.xml
 
 # Documentation generated files #
 #################################

.pre-commit-config.yaml

@@ -1,5 +1,7 @@
 minimum_pre_commit_version: 2.9.2
 exclude: ^LICENSES/|\.(html|csv|svg)$
+ci:
+    autofix_prs: false
 repos:
 -   repo: https://github.com/MarcoGorelli/absolufy-imports
     rev: v0.3.0
@@ -33,10 +35,13 @@ repos:
         exclude: ^pandas/_libs/src/(klib|headers)/
         args: [--quiet, '--extensions=c,h', '--headers=h', --recursive, '--filter=-readability/casting,-runtime/int,-build/include_subdir']
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.0
+    rev: 3.9.1
     hooks:
     -   id: flake8
-        additional_dependencies: [flake8-comprehensions>=3.1.0, flake8-bugbear>=21.3.2]
+        additional_dependencies:
+            - flake8-comprehensions==3.1.0
+            - flake8-bugbear==21.3.2
+            - pandas-dev-flaker==0.2.0
     -   id: flake8
         name: flake8 (cython)
         types: [cython]
@@ -51,10 +56,10 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.11.0
+    rev: v2.12.0
     hooks:
     -   id: pyupgrade
-        args: [--py37-plus, --keep-runtime-typing]
+        args: [--py37-plus]
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.8.0
     hooks:
@@ -69,6 +74,11 @@ repos:
     rev: v1.2.2
     hooks:
     -   id: yesqa
+        additional_dependencies:
+            - flake8==3.9.1
+            - flake8-comprehensions==3.1.0
+            - flake8-bugbear==21.3.2
+            - pandas-dev-flaker==0.2.0
 -   repo: local
     hooks:
     -   id: flake8-rst
@@ -79,76 +89,18 @@ repos:
         types: [rst]
         args: [--filename=*.rst]
         additional_dependencies: [flake8-rst==0.7.0, flake8==3.7.9]
-    -   id: frame-or-series-union
-        name: Check for use of Union[Series, DataFrame] instead of FrameOrSeriesUnion alias
-        entry: Union\[.*(Series,.*DataFrame|DataFrame,.*Series).*\]
-        language: pygrep
-        types: [python]
-        exclude: ^pandas/_typing\.py$
-    -   id: inconsistent-namespace-usage
-        name: 'Check for inconsistent use of pandas namespace'
-        entry: python scripts/check_for_inconsistent_pandas_namespace.py
-        language: python
-        types: [python]
-    -   id: incorrect-code-directives
-        name: Check for incorrect code block or IPython directives
-        language: pygrep
-        entry: (\.\. code-block ::|\.\. ipython ::)
-        types_or: [python, cython, rst]
-    -   id: no-os-remove
-        name: Check code for instances of os.remove
-        entry: os\.remove
-        language: pygrep
-        types: [python]
-        files: ^pandas/tests/
-        exclude: |
-            (?x)^
-            pandas/tests/io/excel/test_writers\.py
-            |pandas/tests/io/pytables/common\.py
-            |pandas/tests/io/pytables/test_store\.py$
-    -   id: non-standard-imports
-        name: Check for non-standard imports
-        language: pygrep
-        entry: |
-            (?x)
-            # Check for imports from pandas.core.common instead of `import pandas.core.common as com`
-            from\ pandas\.core\.common\ import
-            |from\ pandas\.core\ import\ common
-
-            # Check for imports from collections.abc instead of `from collections import abc`
-            |from\ collections\.abc\ import
-
-            # Numpy
-            |from\ numpy\ import\ random
-            |from\ numpy\.random\ import
-        types: [python]
-    -   id: non-standard-imports-in-tests
-        name: Check for non-standard imports in test suite
+    -   id: unwanted-patterns
+        name: Unwanted patterns
         language: pygrep
         entry: |
             (?x)
-            # Check for imports from pandas._testing instead of `import pandas._testing as tm`
-            from\ pandas\._testing\ import
-            |from\ pandas\ import\ _testing\ as\ tm
-
-            # No direct imports from conftest
-            |conftest\ import
-            |import\ conftest
-
-            # Check for use of pandas.testing instead of tm
-            |pd\.testing\.
+            # outdated annotation syntax, missing error codes
+            \#\ type:\ (?!ignore)
+            |\#\ type:\s?ignore(?!\[)
 
-            # Check for pd.api.types instead of from pandas.api.types import ...
-            |(pd|pandas)\.api\.types\.
-        types: [python]
-        files: ^pandas/tests/
-    -   id: np-bool-and-np-object
-        name: Check for use of np.bool/np.object instead of np.bool_/np.object_
-        entry: |
-            (?x)
-            np\.bool[^_8]
-            |np\.object[^_8]
-        language: pygrep
+            # Incorrect code-block / IPython directives
+            |\.\.\ code-block\ ::
+            |\.\.\ ipython\ ::
         types_or: [python, cython, rst]
     -   id: pip-to-conda
         name: Generate pip dependency from conda
@@ -158,64 +110,28 @@ repos:
         files: ^(environment.yml|requirements-dev.txt)$
         pass_filenames: false
         additional_dependencies: [pyyaml]
+    -   id: sync-flake8-versions
+        name: Check flake8 version is synced across flake8, yesqa, and environment.yml
+        language: python
+        entry: python scripts/sync_flake8_versions.py
+        files: ^(\.pre-commit-config\.yaml|environment\.yml)$
+        pass_filenames: false
+        additional_dependencies: [pyyaml]
     -   id: title-capitalization
         name: Validate correct capitalization among titles in documentation
         entry: python scripts/validate_rst_title_capitalization.py
         language: python
         types: [rst]
         files: ^doc/source/(development|reference)/
-    -   id: type-not-class
-        name: Check for use of foo.__class__ instead of type(foo)
-        entry: \.__class__
-        language: pygrep
-        types_or: [python, cython]
-    -   id: unwanted-patterns-bare-pytest-raises
-        name: Check for use of bare pytest raises
-        language: python
-        entry: python scripts/validate_unwanted_patterns.py --validation-type="bare_pytest_raises"
-        types: [python]
-        files: ^pandas/tests/
-        exclude: ^pandas/tests/extension/
-    -   id: unwanted-patterns-private-function-across-module
-        name: Check for use of private functions across modules
-        language: python
-        entry: python scripts/validate_unwanted_patterns.py --validation-type="private_function_across_module"
-        types: [python]
-        exclude: ^(asv_bench|pandas/tests|doc)/
-    -   id: unwanted-patterns-private-import-across-module
-        name: Check for import of private attributes across modules
-        language: python
-        entry: python scripts/validate_unwanted_patterns.py --validation-type="private_import_across_module"
-        types: [python]
-        exclude: ^(asv_bench|pandas/tests|doc)/
-    -   id: unwanted-patterns-pytest-xfail
-        name: Check for use of pytest.xfail
-        entry: pytest\.xfail
-        language: pygrep
-        types: [python]
-        files: ^pandas/tests/
-    -   id: unwanted-patterns-strings-to-concatenate
-        name: Check for use of not concatenated strings
-        language: python
-        entry: python scripts/validate_unwanted_patterns.py --validation-type="strings_to_concatenate"
-        types_or: [python, cython]
-    -   id: unwanted-patterns-strings-with-wrong-placed-whitespace
-        name: Check for strings with wrong placed spaces
-        language: python
-        entry: python scripts/validate_unwanted_patterns.py --validation-type="strings_with_wrong_placed_whitespace"
-        types_or: [python, cython]
-    -   id: unwanted-typing
-        name: Check for outdated annotation syntax and missing error codes
-        entry: |
-            (?x)
-            \#\ type:\ (?!ignore)
-            |\#\ type:\s?ignore(?!\[)
-        language: pygrep
-        types: [python]
     -   id: use-pd_array-in-core
         name: Import pandas.array as pd_array in core
         language: python
         entry: python scripts/use_pd_array_in_core.py
         files: ^pandas/core/
         exclude: ^pandas/core/api\.py$
         types: [python]
+    -   id: no-bool-in-core-generic
+        name: Use bool_t instead of bool in pandas/core/generic.py
+        entry: python scripts/no_bool_in_generic.py
+        language: python
+        files: ^pandas/core/generic\.py$

.travis.yml

@@ -35,16 +35,11 @@ matrix:
   fast_finish: true
 
   include:
-    - arch: arm64
+    - arch: arm64-graviton2
+      virt: lxd
+      group: edge
       env:
-        - JOB="3.7, arm64" PYTEST_WORKERS=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
-
-  allow_failures:
-    # Moved to allowed_failures 2020-09-29 due to timeouts https://github.com/pandas-dev/pandas/issues/36719
-    - arch: arm64
-      env:
-        - JOB="3.7, arm64" PYTEST_WORKERS=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
-
+        - JOB="3.7, arm64" PYTEST_WORKERS="auto" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
 
 before_install:
   - echo "before_install"

LICENSE

@@ -3,7 +3,7 @@ BSD 3-Clause License
 Copyright (c) 2008-2011, AQR Capital Management, LLC, Lambda Foundry, Inc. and PyData Development Team
 All rights reserved.
 
-Copyright (c) 2011-2020, Open source contributors.
+Copyright (c) 2011-2021, Open source contributors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: