More clean up and dependency updates #155
Merged
Conversation
This file contains 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
…ved the egg-info folder that was incorporated at some point in the past - maybe by mistake
aschroed
changed the title
aschroed
changed the title
|
Updating xlrd to xlrd3 allows this to build on python 3.8 and 3.9 and this seems a reasonable approach for now as it allows support for reading both xls and xlsx workbooks. |
willronchetti
approved these changes
Mar 29, 2022
tests/test_get_field_info.py
Outdated
| @@ -343,9 +343,9 @@ def test_get_uploadable_fields_mock(connection_mock, mocker, returned_vendor_sch | |||
| def xls_to_list(xls_file, sheet): | |||
| """To compare xls files to reference ones, return a sorted list of content.""" | |||
| from operator import itemgetter | |||
| import xlrd | |||
| import xlrd3 | |||
There was a problem hiding this comment.
I'd move this to a top level import. Same comment below.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR builds off the long standing but recently merged PR of the same name that removed python2 support and got things working in both Python 3.6(.1 and above) and 3.7.
Dependencies were updated and tested on Python 3.8 and 3.9 so can use same versions as dcicutils. Looks like deprecated system time library dependencies are used in xlrd and xlwt (that are really only for older xls file versions in any case) so will likely need to update these packages which is not trivial. Will look into it when I have time
Some unneeded (leftover) dependencies were removed.
NOTE: there used to be an awscli dependency likely to support the
subprocess('aws s3 cp')call but I built several virtual environments and installs without this dependency and everything still worked fine -but- I wasn't sure if this was because awscli or similar functionality came in with dcicutils or if the dependency is still needed and for some reason the subprocess call is able to use my non-virtual env system installed as tools and not sure how to test.Some old and unused imports - some of which I believe were related to python2 support - were removed.
At some point a python-eggs folder was included in the repo in the wranglerstools directory. This likely should never have been in the repo but is not used or needed with the current poetry packaging.