Skip to content

Commit 39d980a

Browse files
authored
Merge pull request #63 from pandas-dev/master
Sync Fork from Upstream Repo
2 parents 2a609b3 + e88629f commit 39d980a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ci/setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ echo
5050
echo "update conda"
5151
conda config --set ssl_verify false
5252
conda config --set quiet true --set always_yes true --set changeps1 false
53-
conda install pip # create conda to create a historical artifact for pip & setuptools
53+
conda install pip conda # create conda to create a historical artifact for pip & setuptools
5454
conda update -n base conda
5555

5656
echo "conda info -a"

pandas/tests/base/test_ops.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,12 @@ def test_value_counts_unique_nunique_null(self, null_obj, index_or_series_obj):
277277
pytest.skip(f"values of {klass} cannot be changed")
278278
elif isinstance(orig, pd.MultiIndex):
279279
pytest.skip("MultiIndex doesn't support isna")
280+
elif orig.duplicated().any():
281+
pytest.xfail(
282+
"The test implementation isn't flexible enough to deal"
283+
" with duplicated values. This isn't a bug in the"
284+
" application code, but in the test code."
285+
)
280286

281287
# special assign to the numpy array
282288
if is_datetime64tz_dtype(obj):

0 commit comments

Comments
 (0)