Skip to content

Commit

Permalink
Fix setup.py dependencies (#49)
Browse files Browse the repository at this point in the history
* Fix setuppy dependencies

Signed-off-by: Willem Pienaar <git@willem.co>

* Upgrade Feast

Signed-off-by: Willem Pienaar <git@willem.co>

* Fix bug in pip install

Signed-off-by: Willem Pienaar <git@willem.co>
  • Loading branch information
woop committed Mar 24, 2021
1 parent 79b888f commit a139916
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ format-python:
#cd ${ROOT_DIR}/tests/e2e; black --target-version py37 .

install-python-ci-dependencies:
pip install --no-cache-dir -r python/requirements-ci.txt
pip install -U --no-cache-dir -r python/requirements-ci.txt

compile-protos-python:
$(MAKE) install-python-ci-dependencies || true
Expand Down
1 change: 1 addition & 0 deletions infra/docker/jobservice/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && apt-get -y install make git wget
# Install Feast SDK
RUN git init .
COPY README.md README.md
RUN make install-python-ci-dependencies
RUN make install-python
RUN pip install "s3fs" "boto3" "urllib3>=1.25.4"

Expand Down
6 changes: 3 additions & 3 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@


def pre_install_build():
subprocess.check_call("make compile-protos-python", shell=True, cwd=f"{repo_root}")
subprocess.check_call("make compile-protos-python", shell=True, cwd=f"{repo_root}", executable='/bin/bash')


class CustomInstallCommand(install):
Expand Down Expand Up @@ -97,7 +97,7 @@ def run(self):
long_description_content_type="text/markdown",
python_requires=REQUIRES_PYTHON,
url=URL,
packages=find_packages(exclude=("tests",)),
packages=find_packages(exclude=("tests",)) + ['.'],
install_requires=REQUIRED,
# https://stackoverflow.com/questions/28509965/setuptools-development-requirements
# Install dev requirements with: pip install -e .[dev]
Expand All @@ -117,7 +117,7 @@ def run(self):
],
entry_points={"console_scripts": ["feast-spark=feast_spark.cli:cli"]},
use_scm_version={"root": "../", "relative_to": __file__, "tag_regex": TAG_REGEX},
setup_requires=["setuptools_scm"],
setup_requires=["setuptools_scm", "grpcio-tools", "feast", "mypy-protobuf"],
cmdclass={
"install": CustomInstallCommand,
"develop": CustomDevelopCommand,
Expand Down

0 comments on commit a139916

Please sign in to comment.