Skip to content
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

DM-20941: Cleanups (fix third-party deps in table file; remove dependency on future; update license statements) #48

Merged
merged 6 commits into from Aug 8, 2019

Conversation

jonathansick
Copy link
Member

@jonathansick jonathansick commented Aug 8, 2019

  • Re-add the third-party dependencies in the table file that got accidentally dropped in DM-17205: Switch to --doctest-plus for doctest testing #46.
  • Python 3-only now:
    • Remove usage of __future__ imports
    • Remove usage of the future and past packages
    • Remove dependency on python_future
  • Update code license comments to match the final standard.
  • Dropped the ups/verify.build file that not used by anything anymore.

Note I tried to remove the empty __init__.py files, but did run into test issues. I'll have to circle back on that.

CI link: https://ci.lsst.codes/blue/organizations/jenkins/stack-os-matrix/detail/stack-os-matrix/30244/pipeline

Copy link
Member

@timj timj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Some minor comments on the table file.

ups/verify.table Outdated
setupRequired(pyyaml)
setupRequired(requests)
setupRequired(numpy)
setupRequired(base)
setupRequired(utils)
setupRequired(pex_exceptions)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could probably remove this dependency by noting that lsst.pex.exceptions.NotFoundError looks like a LookupError in Python land.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I just switch it without introducing a breaking API change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no API change is there? I think you only use NotFoundError when you are using getPackageDir. Changing those to LookupError should be fine shouldn't it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes. perfect

ups/verify.table Outdated
@@ -1,4 +1,8 @@
setupRequired(sconsUtils)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We always list the sconsUtils dependency if you a package is using sconsUtils.

ups/verify.table Outdated
setupRequired(pyyaml)
setupRequired(requests)
setupRequired(numpy)
setupRequired(base)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utils is bringing in base, and your __init__.py files go out of their way to work even if base is missing, so I'd tend to not put base in here.

All of these features are now mandatory in our supported Python version.
This makes the code fully Python 3 :)

Also drops the python_future dependency from the table file.
lsst.pex.exceptions.NotFoundError is equivalent to the built-in
LookupError.
@jonathansick
Copy link
Member Author

Thanks @timj I've made those fixes. I'll put you down as the official reviewer in Jira too.

@jonathansick jonathansick merged commit 7b7a99b into master Aug 8, 2019
@jonathansick jonathansick deleted the tickets/DM-20941 branch August 8, 2019 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants