-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
Restore CI after PY2 drop #25752
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
Merged
+128
−15
Merged
Restore CI after PY2 drop #25752
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8cb95fc
Restore PY35 CI
h-vetinari 2ac4861
Merge remote-tracking branch 'upstream/master' into restore_ci
h-vetinari 4dab8ff
Review (jreback)
h-vetinari fa5b4c2
Tentatively remove xfails
h-vetinari e3aafd0
Re-add last necessary xfail
h-vetinari 9a3aba3
Merge remote-tracking branch 'upstream/master' into restore_ci
h-vetinari ddb1ea7
Correctly sort imports
h-vetinari e993eeb
Unpin openpyxl for azure-35-macos job
h-vetinari d600e40
Merge remote-tracking branch 'upstream/master' into restore_ci
h-vetinari 6cdb0aa
Unpin unsatifiable pymysql
h-vetinari 05b123d
Try removing xfail again after unpinning openpyxl
h-vetinari f733451
Updates
h-vetinari 564a5a0
Merge remote-tracking branch 'upstream/master' into restore_ci
h-vetinari File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
name: pandas-dev | ||
channels: | ||
- defaults | ||
- conda-forge | ||
dependencies: | ||
- beautifulsoup4==4.4.1 | ||
- bottleneck=1.2.0 | ||
- cython=0.28.2 | ||
- hypothesis>=3.58.0 | ||
- jinja2=2.8 | ||
- numexpr=2.6.1 | ||
- numpy=1.12.0 | ||
- openpyxl=2.4.0 | ||
- pytables=3.4.2 | ||
- python-dateutil=2.5.0 | ||
- python=3.5* | ||
- pytz=2015.4 | ||
- scipy=0.18.1 | ||
- xlrd=1.0.0 | ||
- xlsxwriter=0.7.7 | ||
- xlwt=1.0.0 | ||
# universal | ||
- pytest-xdist | ||
- pytest-mock | ||
- isort | ||
- pip: | ||
# for python 3.5, pytest>=4.0.2 is not available in conda | ||
- pytest>=4.0.2 | ||
- html5lib==1.0b2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
name: pandas-dev | ||
channels: | ||
- defaults | ||
- conda-forge | ||
dependencies: | ||
- beautifulsoup4==4.5.1 | ||
- bottleneck=1.2.0 | ||
- cython=0.28.2 | ||
- lxml | ||
- matplotlib=2.0.0 | ||
- numpy=1.12.0 | ||
- openpyxl=2.4.0 | ||
- python-dateutil | ||
- python-blosc | ||
- python=3.6 | ||
- pytz=2016.10 | ||
- scipy | ||
- sqlalchemy=1.1.4 | ||
- xlrd=1.0.0 | ||
- xlsxwriter=0.9.4 | ||
- xlwt=1.2.0 | ||
# universal | ||
- pytest>=4.0.2 | ||
- pytest-xdist | ||
- pytest-mock | ||
- hypothesis>=3.58.0 | ||
- isort | ||
- pip: | ||
- html5lib==1.0b2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
name: pandas-dev | ||
channels: | ||
- defaults | ||
- conda-forge | ||
dependencies: | ||
- beautifulsoup4 | ||
- bottleneck | ||
- gcsfs | ||
- html5lib | ||
- jinja2 | ||
- lxml | ||
- matplotlib=3.0.1 | ||
- numexpr | ||
- numpy=1.14.* | ||
- openpyxl | ||
- pytables | ||
- python=3.7.* | ||
- python-dateutil | ||
- pytz | ||
- s3fs | ||
- scipy | ||
- sqlalchemy | ||
- xlrd | ||
- xlsxwriter | ||
- xlwt | ||
# universal | ||
- cython>=0.28.2 | ||
- pytest>=4.0.2 | ||
- pytest-xdist | ||
- pytest-mock | ||
- moto | ||
- hypothesis>=3.58.0 | ||
- isort |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't actually require these versions for sqlalchemy / pymsql, they are just the recommended ones. So may want to re-word this (can do in a followup). We are don't actually reject an earlier version.