remove all dep code for 3.1 #5304

nabobalis · 2021-05-04T13:05:16Z

I always forgot the min cycle for items.

pep8speaks · 2021-05-04T13:05:21Z

Hello @nabobalis! Thanks for updating this PR.

In the file sunpy/coordinates/sun.py:

Line 607:31: W503 line break before binary operator
Line 139:47: W504 line break after binary operator

In the file sunpy/map/mapbase.py:

Line 2083:66: W504 line break after binary operator
Line 2046:31: W503 line break before binary operator
Line 1807:53: W504 line break after binary operator
Line 1240:68: W504 line break after binary operator
Line 1235:46: W504 line break after binary operator
Line 1206:57: W504 line break after binary operator
Line 909:52: W504 line break after binary operator
Line 907:52: W504 line break after binary operator

In the file sunpy/map/tests/test_mapbase.py:

Line 706:87: W504 line break after binary operator
Line 697:87: W504 line break after binary operator
Line 428:78: W504 line break after binary operator
Line 425:78: W504 line break after binary operator
Line 252:113: W504 line break after binary operator
Line 251:95: W504 line break after binary operator
Line 60:34: W504 line break after binary operator

In the file sunpy/net/jsoc/jsoc.py:

Line 545:88: W504 line break after binary operator

In the file sunpy/net/jsoc/tests/test_jsoc.py:

Line 93:69: W504 line break after binary operator

In the file sunpy/net/tests/test_fido.py:

Line 493:76: W504 line break after binary operator

In the file sunpy/timeseries/tests/test_timeseriesbase.py:

Line 727:49: W504 line break after binary operator
Line 656:67: W504 line break after binary operator
Line 655:83: W504 line break after binary operator
Line 438:57: W504 line break after binary operator
Line 437:58: W504 line break after binary operator
Line 304:54: W504 line break after binary operator
Line 303:49: W504 line break after binary operator
Line 289:58: W504 line break after binary operator
Line 288:53: W504 line break after binary operator
Line 276:60: W504 line break after binary operator
Line 275:55: W504 line break after binary operator
Line 273:62: W504 line break after binary operator
Line 272:57: W504 line break after binary operator
Line 269:60: W504 line break after binary operator
Line 268:60: W504 line break after binary operator
Line 267:60: W504 line break after binary operator
Line 266:45: W504 line break after binary operator
Line 263:46: W504 line break after binary operator
Line 262:46: W504 line break after binary operator
Line 261:46: W504 line break after binary operator
Line 260:31: W504 line break after binary operator
Line 258:53: W504 line break after binary operator
Line 257:53: W504 line break after binary operator
Line 256:53: W504 line break after binary operator
Line 255:38: W504 line break after binary operator
Line 253:48: W504 line break after binary operator
Line 252:48: W504 line break after binary operator
Line 251:48: W504 line break after binary operator
Line 250:33: W504 line break after binary operator
Line 247:95: W504 line break after binary operator
Line 246:95: W504 line break after binary operator
Line 245:95: W504 line break after binary operator

Comment last updated at 2021-05-13 13:52:45 UTC

setup.cfg

dstansby

This still needs individual changelogs for each removal specifying what the alternative is to what has been removed.

dstansby · 2021-05-04T14:07:10Z

sorry, just noticed this is draft...

nabobalis · 2021-05-04T17:07:58Z

This still needs individual changelogs for each removal specifying what the alternative is to what has been removed.

Changelogs added for you to review.

nabobalis · 2021-05-04T17:08:51Z

Now to consider if we want to silence, W504 line break after binary operator. Maybe we want the line to be broke before a binary operator.

Cadair · 2021-05-05T12:10:56Z

changelog/5304.removal.1.rst

@@ -0,0 +1 @@
+``sunpy.roi.chaincode.Chaincode`` has been removed in favour of `sunpy.net.helio.Chaincode`.


In general I suggest you add "the deprecated x has been removed" just so it's clear to people not paying attention we gave everyone warning.

wtbarnes · 2021-05-05T16:51:10Z

Test failures in net are real,

2021-05-04T17:28:39.4095315Z =================================== FAILURES ===================================
2021-05-04T17:28:39.4096409Z _________________________ test_tables_single_response __________________________
2021-05-04T17:28:39.4098123Z [gw2] linux -- Python 3.8.9 /home/vsts/work/1/s/.tox/py38-online/bin/python
2021-05-04T17:28:39.4098982Z 
2021-05-04T17:28:39.4099727Z     @pytest.mark.remote_data
2021-05-04T17:28:39.4100535Z     def test_tables_single_response():
2021-05-04T17:28:39.4101355Z         results = Fido.search(
2021-05-04T17:28:39.4102380Z             a.Time("2012/1/1", "2012/1/5"), a.Instrument.lyra, a.Level.two)
2021-05-04T17:28:39.4103225Z     
2021-05-04T17:28:39.4104121Z         with pytest.warns(SunpyDeprecationWarning):
2021-05-04T17:28:39.4104948Z >           tables = results.tables
2021-05-04T17:28:39.4106118Z E           AttributeError: 'UnifiedResponse' object has no attribute 'tables'
2021-05-04T17:28:39.4106850Z 
2021-05-04T17:28:39.4108406Z /home/vsts/work/1/s/.tox/py38-online/lib/python3.8/site-packages/sunpy/net/tests/test_fido.py:205: AttributeError
2021-05-04T17:28:39.4109469Z _______________________________ test_time_query ________________________________
2021-05-04T17:28:39.4110678Z [gw3] linux -- Python 3.8.9 /home/vsts/work/1/s/.tox/py38-online/bin/python
2021-05-04T17:28:39.4111495Z 
2021-05-04T17:28:39.4113330Z client = <sunpy.net.helio.hec.HECClient object at 0x7ff832c1c3a0>
2021-05-04T17:28:39.4114276Z sunpy.net.helio.hec.HECClient
2021-05-04T17:28:39.4114898Z 
2021-05-04T17:28:39.4115777Z Provides access to the HELIO webservices.
2021-05-04T17:28:39.4116737Z 
2021-05-04T17:28:39.4117574Z Attr Type Name Description
2021-05-04T17:28:39.4118581Z --------- ---- -----------
2021-05-04T17:28:39.4119246Z 
2021-05-04T17:28:39.4119951Z     @pytest.mark.remote_data
2021-05-04T17:28:39.4120876Z     def test_time_query(client):
2021-05-04T17:28:39.4122038Z         start = '2005/01/03'
2021-05-04T17:28:39.4124004Z         end = '2005/12/03'
2021-05-04T17:28:39.4126354Z         table_name = 'rhessi_hxr_flare'
2021-05-04T17:28:39.4126987Z         with pytest.raises(SunpyDeprecationWarning):
2021-05-04T17:28:39.4127535Z >           res = client.time_query(start, end, table=table_name, max_records=10)
2021-05-04T17:28:39.4128329Z E           AttributeError: 'HECClient' object has no attribute 'time_query'
2021-05-04T17:28:39.4128715Z 
2021-05-04T17:28:39.4129451Z ../../.tox/py38-online/lib/python3.8/site-packages/sunpy/net/helio/tests/test_helio.py:285: AttributeError
2021-05-04T17:28:39.4130116Z ________________________ test_tables_multiple_response _________________________
2021-05-04T17:28:39.4130896Z [gw2] linux -- Python 3.8.9 /home/vsts/work/1/s/.tox/py38-online/bin/python
2021-05-04T17:28:39.4131276Z 
2021-05-04T17:28:39.4131653Z     @pytest.mark.remote_data
2021-05-04T17:28:39.4132081Z     def test_tables_multiple_response():
2021-05-04T17:28:39.4132831Z         results = Fido.search(a.Time('2012/3/4', '2012/3/6'),
2021-05-04T17:28:39.4133463Z                               a.Instrument.lyra | (a.Instrument.rhessi & a.Physobs.summary_lightcurve))
2021-05-04T17:28:39.4133944Z     
2021-05-04T17:28:39.4134378Z         with pytest.warns(SunpyDeprecationWarning):
2021-05-04T17:28:39.4134837Z >           tables = results.tables
2021-05-04T17:28:39.4135551Z E           AttributeError: 'UnifiedResponse' object has no attribute 'tables'
2021-05-04T17:28:39.4135950Z 
2021-05-04T17:28:39.4136906Z /home/vsts/work/1/s/.tox/py38-online/lib/python3.8/site-packages/sunpy/net/tests/test_fido.py:220: AttributeError
2021-05-04T17:28:39.4137615Z _____________________________ test_search_metadata _____________________________
2021-05-04T17:28:39.4138402Z [gw3] linux -- Python 3.8.9 /home/vsts/work/1/s/.tox/py38-online/bin/python
2021-05-04T17:28:39.4138785Z 
2021-05-04T17:28:39.4139212Z client = <sunpy.net.jsoc.jsoc.JSOCClient object at 0x7ff833b1b790>
2021-05-04T17:28:39.4139890Z sunpy.net.jsoc.jsoc.JSOCClient
2021-05-04T17:28:39.4140171Z 
2021-05-04T17:28:39.4140654Z Provides access to the JSOC ...                                                                                                     
2021-05-04T17:28:39.4141510Z Length = 507 rows
2021-05-04T17:28:39.4141766Z 
2021-05-04T17:28:39.4142147Z     @pytest.mark.remote_data
2021-05-04T17:28:39.4142596Z     def test_search_metadata(client):
2021-05-04T17:28:39.4143117Z         with pytest.raises(SunpyDeprecationWarning):
2021-05-04T17:28:39.4144039Z >           metadata = client.search_metadata(a.Time('2020-01-01T00:00:00', '2020-01-01T00:02:00'),
2021-05-04T17:28:39.4145165Z                                               a.jsoc.Series('aia.lev1_euv_12s'), a.Wavelength(304*u.AA))
2021-05-04T17:28:39.4146043Z E           AttributeError: 'JSOCClient' object has no attribute 'search_metadata'
2021-05-04T17:28:39.4146434Z 
2021-05-04T17:28:39.4147191Z ../../.tox/py38-online/lib/python3.8/site-packages/sunpy/net/jsoc/tests/test_jsoc.py:302: AttributeError

wtbarnes

The net tests need to be adjusted for the methods/attributes that are being removed here (see failures). Also, docs/code_ref/roi.rst needs to be removed as it is causing the docs build to fail.

nabobalis · 2021-05-05T18:10:58Z

Hopefully should be fixed now.

Cadair · 2021-05-06T09:04:50Z

Still busted.

nabobalis · 2021-05-06T09:35:19Z

FAILED ../../.tox/py38-online/lib/python3.8/site-packages/sunpy/net/jsoc/tests/test_jsoc.py::test_build_table
FAILED ../../.tox/py38-online/lib/python3.8/site-packages/sunpy/net/tests/test_fido.py::test_tables_single_response
FAILED ../../.tox/py38-online/lib/python3.8/site-packages/sunpy/net/tests/test_fido.py::test_tables_multiple_response
FAILED ../../.tox/py38-online/lib/python3.8/site-packages/sunpy/net/jsoc/tests/test_jsoc.py::test_lookup_records_errors

NO IT AINT

Cadair · 2021-05-06T09:49:54Z

boooo JSOC booo

dstansby

The online test failures look like they need fixing (as opposed to being servers down)

nabobalis · 2021-05-06T11:14:06Z

Oh yeah so they are.

nabobalis · 2021-05-08T15:50:47Z

Fingers crossed, this time.

Nope one more.

Fixed now.

sunpy/net/jsoc/jsoc.py

dstansby

👍 , just two non-blocking suggestions

changelog/5304.removal.6.rst

changelog/5304.removal.rst

Co-authored-by: David Stansby <[email protected]>

Co-authored-by: Albert Y. Shih <[email protected]>

nabobalis added the No Backport A PR that isn't to be backported to any release branch. (To be used as a flag to other maintainers) label May 4, 2021

nabobalis commented May 4, 2021

View reviewed changes

setup.cfg Outdated Show resolved Hide resolved

dstansby suggested changes May 4, 2021

View reviewed changes

nabobalis marked this pull request as ready for review May 4, 2021 17:10

nabobalis requested review from a team as code owners May 4, 2021 17:10

nabobalis removed request for a team May 4, 2021 17:10

Cadair reviewed May 5, 2021

View reviewed changes

wtbarnes approved these changes May 5, 2021

View reviewed changes

wtbarnes self-requested a review May 5, 2021 16:46

wtbarnes requested changes May 5, 2021

View reviewed changes

nabobalis added the Refactoring Code changes without affecting API (generally) label May 6, 2021

Cadair approved these changes May 6, 2021

View reviewed changes

nabobalis requested review from wtbarnes and dstansby May 6, 2021 10:24

dstansby suggested changes May 6, 2021

View reviewed changes

nabobalis removed the request for review from wtbarnes May 6, 2021 11:14

nabobalis commented May 9, 2021

View reviewed changes

sunpy/net/jsoc/jsoc.py Show resolved Hide resolved

nabobalis commented May 9, 2021

View reviewed changes

sunpy/net/jsoc/jsoc.py Show resolved Hide resolved

nabobalis requested review from wtbarnes and dstansby May 10, 2021 12:14

dstansby approved these changes May 10, 2021

View reviewed changes

changelog/5304.removal.6.rst Outdated Show resolved Hide resolved

changelog/5304.removal.6.rst Outdated Show resolved Hide resolved

nabobalis added the Needs Review Needs reviews before merge. label May 12, 2021

wtbarnes approved these changes May 13, 2021

View reviewed changes

ayshih reviewed May 13, 2021

View reviewed changes

changelog/5304.removal.rst Outdated Show resolved Hide resolved

nabobalis and others added 4 commits May 13, 2021 14:52

remove all dep code for 3.1

eed54f1

update left overs

e0249b3

Apply suggestions from code review

9587a0b

Co-authored-by: David Stansby <[email protected]>

Update changelog/5304.removal.rst

990a0f6

Co-authored-by: Albert Y. Shih <[email protected]>

nabobalis merged commit 92dadc0 into sunpy:main May 13, 2021

nabobalis deleted the removal branch May 13, 2021 15:46

dstansby removed the Needs Review Needs reviews before merge. label Jan 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove all dep code for 3.1 #5304

remove all dep code for 3.1 #5304

nabobalis commented May 4, 2021 •

edited

Loading

pep8speaks commented May 4, 2021 •

edited

Loading

dstansby left a comment

dstansby commented May 4, 2021

nabobalis commented May 4, 2021

nabobalis commented May 4, 2021

Cadair May 5, 2021

nabobalis May 5, 2021

wtbarnes commented May 5, 2021

wtbarnes left a comment

nabobalis commented May 5, 2021

Cadair commented May 6, 2021

nabobalis commented May 6, 2021

Cadair commented May 6, 2021

dstansby left a comment

nabobalis commented May 6, 2021

nabobalis commented May 8, 2021 •

edited

Loading

dstansby left a comment

		@@ -0,0 +1 @@
		``sunpy.roi.chaincode.Chaincode`` has been removed in favour of `sunpy.net.helio.Chaincode`.

remove all dep code for 3.1 #5304

remove all dep code for 3.1 #5304

Conversation

nabobalis commented May 4, 2021 • edited Loading

pep8speaks commented May 4, 2021 • edited Loading

Comment last updated at 2021-05-13 13:52:45 UTC

dstansby left a comment

Choose a reason for hiding this comment

dstansby commented May 4, 2021

nabobalis commented May 4, 2021

nabobalis commented May 4, 2021

Cadair May 5, 2021

Choose a reason for hiding this comment

nabobalis May 5, 2021

Choose a reason for hiding this comment

wtbarnes commented May 5, 2021

wtbarnes left a comment

Choose a reason for hiding this comment

nabobalis commented May 5, 2021

Cadair commented May 6, 2021

nabobalis commented May 6, 2021

Cadair commented May 6, 2021

dstansby left a comment

Choose a reason for hiding this comment

nabobalis commented May 6, 2021

nabobalis commented May 8, 2021 • edited Loading

dstansby left a comment

Choose a reason for hiding this comment

nabobalis commented May 4, 2021 •

edited

Loading

pep8speaks commented May 4, 2021 •

edited

Loading

nabobalis commented May 8, 2021 •

edited

Loading