Add 2019 and 2020 directories to delphi-utils package_data

[krivard]

Description

We missed this in #1351, and CI didn't catch it because we install with -e 😢

Update the package_data for delphi-utils to include the 2019 and 2020 directories, not just the root csv files.

Changelog

Itemize code/test/documentation changes and files added/removed.

• setup.py: package_data

Fixes

• Fixes delphi-utils dual-year geocoding files are not being exported in the package #1388

[krivard]

To test this:

$ git checkout krivard/fix-package-data
$ cd jhu
$ make clean install
$ env/bin/pip uninstall delphi-epidata
$ env/bin/pip install ../_delphi_utils_python/.
$ make test

[dshemetov]

LGTM, but jw: this means that delphi_utils on PyPI should have an error when instantiating GeoMapper() right? I tried installing it and it seems to be fine, so I'm confused. Tbh, most likely pip must be using the -e flag without me invoking it (grrr).

[krivard]

What did you try? I get this:

krivard@rinkitink:~/projects/covid/debug$ mkdir check-utils
krivard@rinkitink:~/projects/covid/debug$ cd check-utils/
krivard@rinkitink:~/projects/covid/debug/check-utils$ python3.8 -m venv env
krivard@rinkitink:~/projects/covid/debug/check-utils$ source env/bin/activate
(env) krivard@rinkitink:~/projects/covid/debug/check-utils$ pip install delphi-utils==0.2.5
[...]
(env) krivard@rinkitink:~/projects/covid/debug/check-utils$ python
Python 3.8.12 (default, Sep 10 2021, 00:16:05) 
[GCC 7.5.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> from delphi_utils.geomap import GeoMapper
>>> f=GeoMapper()
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/home/krivard/projects/covid/debug/check-utils/env/lib/python3.8/site-packages/delphi_utils/geomap.py", line 136, in __init__
    self._load_crosswalk_from_file(from_code,
  File "/home/krivard/projects/covid/debug/check-utils/env/lib/python3.8/site-packages/delphi_utils/geomap.py", line 145, in _load_crosswalk_from_file
    stream = pkg_resources.resource_stream(__name__, data_path)
  File "/home/krivard/projects/covid/debug/check-utils/env/lib/python3.8/site-packages/pkg_resources/__init__.py", line 1136, in resource_stream
    return get_provider(package_or_requirement).get_resource_stream(
  File "/home/krivard/projects/covid/debug/check-utils/env/lib/python3.8/site-packages/pkg_resources/__init__.py", line 1608, in get_resource_stream
    return open(self._fn(self.module_path, resource_name), 'rb')
FileNotFoundError: [Errno 2] No such file or directory: '/home/krivard/projects/covid/debug/check-utils/env/lib/python3.8/site-packages/delphi_utils/data/2020/zip_fips_table.csv'

[dshemetov]

Ok got that same error! I think I was making some derp error