Skip to content

Commit 5fc40bd

Browse files
committed
Merge branch 'master' of https://github.com/pandas-dev/pandas into pre-head
2 parents cc1f6f8 + cc1c406 commit 5fc40bd

File tree

168 files changed

+3954
-2446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+3954
-2446
lines changed

asv_bench/benchmarks/io/sas.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class SAS:
99
param_names = ["format"]
1010

1111
def setup(self, format):
12-
# Read files that are located in 'pandas/io/tests/sas/data'
12+
# Read files that are located in 'pandas/tests/io/sas/data'
1313
files = {"sas7bdat": "test1.sas7bdat", "xport": "paxraw_d_short.xpt"}
1414
file = files[format]
1515
paths = [

asv_bench/benchmarks/tslibs/timestamp.py

+19
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
import datetime
22

33
import dateutil
4+
import numpy as np
45
import pytz
56

67
from pandas import Timestamp
78

89

910
class TimestampConstruction:
11+
def setup(self):
12+
self.npdatetime64 = np.datetime64("2020-01-01 00:00:00")
13+
self.dttime_unaware = datetime.datetime(2020, 1, 1, 0, 0, 0)
14+
self.dttime_aware = datetime.datetime(2020, 1, 1, 0, 0, 0, 0, pytz.UTC)
15+
self.ts = Timestamp("2020-01-01 00:00:00")
16+
1017
def time_parse_iso8601_no_tz(self):
1118
Timestamp("2017-08-25 08:16:14")
1219

@@ -28,6 +35,18 @@ def time_fromordinal(self):
2835
def time_fromtimestamp(self):
2936
Timestamp.fromtimestamp(1515448538)
3037

38+
def time_from_npdatetime64(self):
39+
Timestamp(self.npdatetime64)
40+
41+
def time_from_datetime_unaware(self):
42+
Timestamp(self.dttime_unaware)
43+
44+
def time_from_datetime_aware(self):
45+
Timestamp(self.dttime_aware)
46+
47+
def time_from_pd_timestamp(self):
48+
Timestamp(self.ts)
49+
3150

3251
class TimestampProperties:
3352
_tzs = [None, pytz.timezone("Europe/Amsterdam"), pytz.UTC, dateutil.tz.tzutc()]

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
- template: ci/azure/posix.yml
55
parameters:
66
name: macOS
7-
vmImage: xcode9-macos10.13
7+
vmImage: macOS-10.14
88

99
- template: ci/azure/posix.yml
1010
parameters:

doc/source/_static/css/pandas.css

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/* Getting started index page */
2+
3+
.intro-card {
4+
background: #fff;
5+
border-radius: 0;
6+
padding: 30px 10px 10px 10px;
7+
margin: 10px 0px;
8+
}
9+
10+
.intro-card .card-text {
11+
margin: 20px 0px;
12+
/*min-height: 150px; */
13+
}
14+
15+
.custom-button {
16+
background-color: #dcdcdc;
17+
border: none;
18+
color: #484848;
19+
text-align: center;
20+
text-decoration: none;
21+
display: inline-block;
22+
font-size: 0.9rem;
23+
border-radius: 0.5rem;
24+
max-width: 220px;
25+
padding: 0.5rem 0rem;
26+
}
27+
28+
.custom-button a {
29+
color: #484848;
30+
}
31+
32+
.custom-button p {
33+
margin-top: 0;
34+
margin-bottom: 0rem;
35+
color: #484848;
36+
}

doc/source/_static/index_api.svg

+97
Loading
+76
Loading
Loading

0 commit comments

Comments
 (0)