Merge remote-tracking branch 'upstream/main' into bisect

Author: simonjayhawkins

.github/workflows/posix.yml

@@ -155,24 +155,11 @@ jobs:
         channel-priority: flexible
         environment-file: ${{ env.ENV_FILE }}
         use-only-tar-bz2: true
-      if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support
 
     - name: Upgrade Arrow version
       run: conda install -n pandas-dev -c conda-forge --no-update-deps pyarrow=${{ matrix.pyarrow_version }}
       if: ${{ matrix.pyarrow_version }}
 
-    - name: Setup PyPy
-      uses: actions/setup-python@v3
-      with:
-        python-version: "pypy-3.8"
-      if: ${{ env.IS_PYPY == 'true' }}
-
-    - name: Setup PyPy dependencies
-      run: |
-        # TODO: re-enable cov, its slowing the tests down though
-        pip install Cython numpy python-dateutil pytz pytest>=6.0 pytest-xdist>=1.31.0 pytest-asyncio>=0.17 hypothesis>=5.5.3
-      if: ${{ env.IS_PYPY == 'true' }}
-
     - name: Build Pandas
       uses: ./.github/actions/build_pandas
 

ci/deps/actions-pypy-38.yaml

@@ -11,6 +11,7 @@ dependencies:
   - cython>=0.29.24
   - pytest>=6.0
   - pytest-cov
+  - pytest-asyncio
   - pytest-xdist>=1.31
   - hypothesis>=5.5.3
 

pandas/_libs/tslibs/period.pyx

@@ -2202,7 +2202,7 @@ cdef class _Period(PeriodMixin):
         2018
 
         If the fiscal year starts in April (`Q-MAR`), the first quarter of
-        2018 will start in April 2017. `year` will then be 2018, but `qyear`
+        2018 will start in April 2017. `year` will then be 2017, but `qyear`
         will be the fiscal year, 2018.
 
         >>> per = pd.Period('2018Q1', freq='Q-MAR')