TST: prepare conftest for #25637 #26596

h-vetinari · 2019-05-31T16:01:11Z

Split off from #25637 at the request of @gfyoung

Relevant discussions:

codecov · 2019-05-31T16:17:51Z

Codecov Report

Merging #26596 into master will decrease coverage by 50.15%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master   #26596       +/-   ##
===========================================
- Coverage   91.84%   41.69%   -50.16%     
===========================================
  Files         174      174               
  Lines       50644    50644               
===========================================
- Hits        46516    21116    -25400     
- Misses       4128    29528    +25400

Flag	Coverage Δ
#multiple	`?`
#single	`41.69% <ø> (-0.11%)`	⬇️

Impacted Files	Coverage Δ
pandas/io/formats/latex.py	`0% <0%> (-100%)`	⬇️
pandas/io/sas/sas_constants.py	`0% <0%> (-100%)`	⬇️
pandas/core/groupby/categorical.py	`0% <0%> (-100%)`	⬇️
pandas/tseries/plotting.py	`0% <0%> (-100%)`	⬇️
pandas/tseries/converter.py	`0% <0%> (-100%)`	⬇️
pandas/io/formats/html.py	`0% <0%> (-99.37%)`	⬇️
pandas/io/sas/sas7bdat.py	`0% <0%> (-91.16%)`	⬇️
pandas/io/sas/sas_xport.py	`0% <0%> (-90.1%)`	⬇️
pandas/core/tools/numeric.py	`10.14% <0%> (-89.86%)`	⬇️
pandas/io/s3.py	`0% <0%> (-89.48%)`	⬇️
... and 128 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f31865...7685370. Read the comment docs.

codecov · 2019-05-31T16:17:53Z

Codecov Report

Merging #26596 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #26596      +/-   ##
==========================================
- Coverage   91.84%   91.84%   -0.01%     
==========================================
  Files         174      174              
  Lines       50644    50644              
==========================================
- Hits        46516    46512       -4     
- Misses       4128     4132       +4

Flag	Coverage Δ
#multiple	`90.37% <ø> (ø)`	⬆️
#single	`41.71% <ø> (-0.09%)`	⬇️

Impacted Files	Coverage Δ
pandas/io/gbq.py	`78.94% <0%> (-10.53%)`	⬇️
pandas/core/frame.py	`97% <0%> (-0.12%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f31865...7685370. Read the comment docs.

h-vetinari · 2019-05-31T16:57:39Z

@gfyoung
Thanks for approving; CI is green. :)

jreback · 2019-06-01T00:41:20Z

pandas/conftest.py

@@ -376,19 +376,25 @@ def unique_nulls_fixture(request):
             FixedOffset(0), FixedOffset(-300), timezone.utc,
             timezone(timedelta(hours=1)),
             timezone(timedelta(hours=-1), name='foo')]
+TIMEZONE_IDS = ['None', 'UTC', 'US/Eastern', 'Asia/Tokyp',


pls don’t merge things until i look

this is duplicating too much code here

what is the point of of these extras?

@jreback : This is carried over from #25637 (and I think a lot of other conversations in other PR's), and the justification was given as a link in the PR description. I leave it here below for convenience:

#25637 (comment)

maybe so but that other has not been reviewed at all

this is not done in a nice way

these should simply be tuples of timezone and id and unpacked when needed

can u do a PR to fix

and to be honest these may not even be needed to do it like this it’s a lot more verbose

The unpacking option seems to overcomplicate as you mentioned. Alternatively, we can just do a list comprehension and pull the __repr__ (or __str__) on the elements of TIMEZONES. That would still keep the IDs but be less "duplicative".

yes i think a nice function would be fine

@jreback: this is not done in a nice way

I disagree. Compare the outputs of @gfyoung's PR with the state I introduced.

I made the IDs explicit precisely because the strs/reprs yields a useless, ugly mix of stuff. Saving these 4 lines is not worth the added hassle when actually debugging tz-tests with pytest -v.

Follow-up to pandas-devgh-26596

Follow-up to gh-26596

xref pandas-devgh-23537

h-vetinari added 3 commits May 31, 2019 17:59

prepare conftest for pandas-dev#25637

f3f8d4f

retrigger azure

8be8c00

also include change for clearer separator

7685370

simonjayhawkins added Testing pandas testing functions or related to the test suite Timezones Timezone data dtype labels May 31, 2019

gfyoung approved these changes May 31, 2019

View reviewed changes

gfyoung merged commit c6a7cc1 into pandas-dev:master Jun 1, 2019

gfyoung added this to the 0.25.0 milestone Jun 1, 2019

jreback reviewed Jun 1, 2019

View reviewed changes

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 1, 2019

MAINT: Condense TIMEZONE_IDS construction

c7293f4

Follow-up to pandas-devgh-26596

gfyoung mentioned this pull request Jun 1, 2019

MAINT: Condense TIMEZONE_IDS construction #26600

Merged

h-vetinari mentioned this pull request Jun 1, 2019

TST: tests for maybe_promote (precursor to #23982) #25637

Merged

h-vetinari deleted the conftest_fixes branch June 1, 2019 15:14

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 1, 2019

MAINT: Condense TIMEZONE_IDS construction

fc3400e

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 2, 2019

CLN: Condense TIMEZONE ID labeling

9e799cb

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 3, 2019

CLN: Condense TIMEZONE ID labeling

1ab924e

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 3, 2019

CLN: Condense TIMEZONE ID labeling

2658e6f

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 4, 2019

CLN: Condense TIMEZONE ID labeling

6bfa177

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 5, 2019

CLN: Condense TIMEZONE ID labeling

32c010c

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 5, 2019

CLN: Condense TIMEZONE ID labeling

bb12ff5

Follow-up to pandas-devgh-26596

gfyoung added a commit to forking-repos/pandas that referenced this pull request Jun 6, 2019

CLN: Condense TIMEZONE ID labeling

d51f7e2

Follow-up to pandas-devgh-26596

jreback pushed a commit that referenced this pull request Jun 6, 2019

CLN: Condense TIMEZONE ID labeling (#26600)

78ba7fc

Follow-up to gh-26596

vaibhavhrt pushed a commit to vaibhavhrt/pandas that referenced this pull request Jun 6, 2019

TST: Datetime conftest.py improvements (pandas-dev#26596)

805d7e8

xref pandas-devgh-23537

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TST: prepare conftest for #25637 #26596

TST: prepare conftest for #25637 #26596

h-vetinari commented May 31, 2019 •

edited by gfyoung

Loading

codecov bot commented May 31, 2019

codecov bot commented May 31, 2019 •

edited

Loading

h-vetinari commented May 31, 2019

jreback Jun 1, 2019

jreback Jun 1, 2019

gfyoung Jun 1, 2019 •

edited

Loading

jreback Jun 1, 2019

jreback Jun 1, 2019

jreback Jun 1, 2019

gfyoung Jun 1, 2019 •

edited

Loading

jreback Jun 1, 2019

h-vetinari Jun 1, 2019

TST: prepare conftest for #25637 #26596

TST: prepare conftest for #25637 #26596

Conversation

h-vetinari commented May 31, 2019 • edited by gfyoung Loading

codecov bot commented May 31, 2019

Codecov Report

codecov bot commented May 31, 2019 • edited Loading

Codecov Report

h-vetinari commented May 31, 2019

jreback Jun 1, 2019

Choose a reason for hiding this comment

jreback Jun 1, 2019

Choose a reason for hiding this comment

gfyoung Jun 1, 2019 • edited Loading

Choose a reason for hiding this comment

jreback Jun 1, 2019

Choose a reason for hiding this comment

jreback Jun 1, 2019

Choose a reason for hiding this comment

jreback Jun 1, 2019

Choose a reason for hiding this comment

gfyoung Jun 1, 2019 • edited Loading

Choose a reason for hiding this comment

jreback Jun 1, 2019

Choose a reason for hiding this comment

h-vetinari Jun 1, 2019

Choose a reason for hiding this comment

h-vetinari commented May 31, 2019 •

edited by gfyoung

Loading

codecov bot commented May 31, 2019 •

edited

Loading

gfyoung Jun 1, 2019 •

edited

Loading

gfyoung Jun 1, 2019 •

edited

Loading