Skip to content

DEPS: replace pyperclip with pyclip #39834 #40101

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

Closed
wants to merge 14 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
env:
PYTEST_WORKERS: "auto"
PANDAS_CI: 1
PATTERN: ((not slow and not network and not clipboard) or (single and db))
PATTERN: ((not slow and not network) or (single and db))

jobs:
Linux_py37_locale:
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ matrix:
include:
- 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=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network 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=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not arm_slow)"


before_install:
Expand Down
30 changes: 0 additions & 30 deletions LICENSES/OTHER
Original file line number Diff line number Diff line change
Expand Up @@ -48,33 +48,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Pyperclip v1.3 license
----------------------

Copyright (c) 2010, Albert Sweigart
All rights reserved.

BSD-style license:

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the pyperclip nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY Albert Sweigart "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL Albert Sweigart BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
python setup.py build_ext -q -j2 && \
python -m pip install --no-build-isolation -e . && \
pytest -m 'not slow and not network and not clipboard' pandas --junitxml=test-data.xml"
pytest -m 'not slow and not network' pandas --junitxml=test-data.xml"
displayName: 'Run 32-bit manylinux2014 Docker Build / Tests'

- task: PublishTestResults@2
Expand Down
15 changes: 8 additions & 7 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@ jobs:
ENV_FILE: ci/deps/azure-macos-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
MACOSX_DEPLOYMENT_TARGET: 10.13

${{ if eq(parameters.name, 'Linux') }}:
py37_minimum_versions:
ENV_FILE: ci/deps/azure-37-minimum_versions.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network and not clipboard"
PATTERN: "not slow and not network"

py37:
ENV_FILE: ci/deps/azure-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network and not clipboard"
PATTERN: "not slow and not network"

py37_locale_slow:
ENV_FILE: ci/deps/azure-37-locale_slow.yaml
CONDA_PY: "37"
PATTERN: "slow"
LANG: "it_IT.utf8"
LC_ALL: "it_IT.utf8"
EXTRA_APT: "language-pack-it xsel"
EXTRA_APT: "language-pack-it"

py37_slow:
ENV_FILE: ci/deps/azure-37-slow.yaml
Expand All @@ -41,7 +42,7 @@ jobs:
py38:
ENV_FILE: ci/deps/azure-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network and not clipboard"
PATTERN: "not slow and not network"

py38_slow:
ENV_FILE: ci/deps/azure-38-slow.yaml
Expand All @@ -56,20 +57,20 @@ jobs:
# we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any
LANG: "zh_CN.utf8"
LC_ALL: "zh_CN.utf8"
EXTRA_APT: "language-pack-zh-hans xsel"
EXTRA_APT: "language-pack-zh-hans xclip"

py38_np_dev:
ENV_FILE: ci/deps/azure-38-numpydev.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
TEST_ARGS: "-W error"
PANDAS_TESTING_MODE: "deprecate"
EXTRA_APT: "xsel"
EXTRA_APT: "xclip"

py39:
ENV_FILE: ci/deps/azure-39.yaml
CONDA_PY: "39"
PATTERN: "not slow and not network and not clipboard"
PATTERN: "not slow and not network"

steps:
- script: |
Expand Down
1 change: 1 addition & 0 deletions ci/deps/azure-38-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ dependencies:
- pip
- pip:
- pyxlsb
- pyclip
1 change: 1 addition & 0 deletions ci/deps/azure-38-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ dependencies:
- "--pre"
- "numpy"
- "scipy"
- pyclip
1 change: 1 addition & 0 deletions ci/deps/azure-macos-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ dependencies:
- cython>=0.29.21
- pyreadstat
- pyxlsb
- pyclip
1 change: 1 addition & 0 deletions ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ dependencies:
- pip
- pip:
- pyxlsb
- pyclip
3 changes: 3 additions & 0 deletions ci/deps/azure-windows-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ dependencies:
- xlrd<2.0
- xlsxwriter
- xlwt
- pip
- pip:
- pyclip
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ dependencies:
- pyarrow>=0.15.0 # pandas.read_parquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather
- python-snappy # required by pyarrow

- pyqt>=5.9.2 # pandas.read_clipboard
- pytables>=3.5.1 # pandas.read_hdf, DataFrame.to_hdf
- s3fs>=0.4.0 # file IO when using 's3://...' path
- fsspec>=0.7.4 # for generic remote file operations
Expand All @@ -115,3 +114,4 @@ dependencies:
- pip:
- git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103
- numpydoc < 1.2 # 2021-02-09 1.2dev breaking CI
- pyclip # pandas.read_clipboard
1 change: 0 additions & 1 deletion pandas/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ def pytest_configure(config):
"markers", "db: tests requiring a database (mysql or postgres)"
)
config.addinivalue_line("markers", "high_memory: mark a test as a high-memory only")
config.addinivalue_line("markers", "clipboard: mark a pd.read_clipboard test")
config.addinivalue_line(
"markers", "arm_slow: mark a test as slow for arm64 architecture"
)
Expand Down
Loading