From 21b49e717d42de8cf39429a3f75b8b7071d98111 Mon Sep 17 00:00:00 2001
From: jyap-abc <jordan.yap@abcellera.com>
Date: Wed, 4 Jan 2023 18:46:23 -0800
Subject: [PATCH] Remove .whl build hack, update with 1.2.0 deps

---
 .circleci/config.yml    |  2 +-
 .scripts/build_steps.sh |  4 ++--
 recipe/meta.yaml        | 29 +++++++++--------------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3e61aa2..8b4ef2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 # This file was generated automatically from conda-smithy. To update this configuration,
 # update the conda-forge.yml and/or the recipe/meta.yaml.
-# -*- mode: yaml -*-
+# -*- mode: jinja-yaml -*-
 
 version: 2
 
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 595f8b5..71a4242 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -33,9 +33,9 @@ CONDARC
 
 
 mamba install --update-specs --yes --quiet --channel conda-forge \
-    conda-build pip boa conda-forge-ci-setup=3
+    conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12"
 mamba update --update-specs --yes --quiet --channel conda-forge \
-    conda-build pip boa conda-forge-ci-setup=3
+    conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12"
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index e792e8a..495c762 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -6,30 +6,19 @@ package:
   version: {{ version }}
 
 source:
-  # Directly install .whl build, due to upstream .tar.gz dist error
-  # Here including both:
-  # * .tar.gz, for LICENSE
-  # * .whl, for code
-  - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/flytekit-{{ version }}.tar.gz
-    sha256: 16c09335a1f106de2903ce5e369985c61c1c3cbb9be9c8d470ff2507a6b16e56
-    folder: .
-  - url: https://files.pythonhosted.org/packages/7c/a9/307368ce4d9040378e738cb46990528827ce8de46a19a65a3a2cb5e89337/flytekit-1.1.0-py3-none-any.whl
-    sha256: 4686a0e02e71e7ab1aff4a79ba8976be7ef63767e8c853a3824a88e182f9df4e
-    fn: flytekit-{{ version }}-py3-none-any.whl
-    folder: .
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/flytekit-{{ version }}.tar.gz
+  sha256: 16c09335a1f106de2903ce5e369985c61c1c3cbb9be9c8d470ff2507a6b16e56
 
 build:
-  number: 0
-  noarch: python
   entry_points:
     - pyflyte-execute=flytekit.bin.entrypoint:execute_task_cmd
     - pyflyte-fast-execute=flytekit.bin.entrypoint:fast_execute_task_cmd
     - pyflyte-map-execute=flytekit.bin.entrypoint:map_execute_task_cmd
     - pyflyte=flytekit.clis.sdk_in_container.pyflyte:main
     - flyte-cli=flytekit.clis.flyte_cli.main:_flyte_cli
-  # Install from wheel, revert to standard pip install -vv . after:
-  # https://github.com/flyteorg/flytekit/pull/1088
-  script: {{ PYTHON }} -m pip install -vv flytekit-{{ version }}-py3-none-any.whl
+  script: {{ PYTHON }} -m pip install . -vv
+  number: 1
+  noarch: python
 
 requirements:
   host:
@@ -44,17 +33,18 @@ requirements:
     - dataclasses-json >=0.5.2
     - deprecated >=1.0,<2.0
     - diskcache >=5.2.1
-    - docker-py >=5.0.3,<6.0.0
+    - docker-py >=5.0.3,<7.0.0
     - docker-image-py >=0.1.10
     - docstring_parser >=0.9.0
     - flyteidl >=1.1.3,<1.2.0
     - grpcio >=1.43.0,<2.0 # upstream blocks grpcio 1.45.0, but build is present in conda-forge
     - grpcio-status >=1.43 # upstream blocks grpcio 1.45.0, but build is present in conda-forge
     - importlib-metadata
+    - joblib
     - keyring >=18.0.1
     - marshmallow-jsonschema >=0.12.0
     - natsort >=7.0.1
-    - numpy
+    - numpy <1.24.0
     - pandas >=1.0.0,<2.0.0
     - protobuf >=3.6.1,<4
     - pyarrow >=4.0.0,<7.0.0
@@ -69,7 +59,7 @@ requirements:
     - retry ==0.9.2
     - sortedcontainers >=1.5.9,<3.0.0
     - statsd >=3.0.0,<4.0.0
-    - typing-extensions
+    - typing_extensions
     - urllib3 >=1.22,<2.0.0
     - wheel >=0.30.0,<1.0.0
     - wrapt >=1.0.0,<2.0.0
@@ -79,7 +69,6 @@ test:
     - example.py
   imports:
     - flytekit
-    - flytekit.bin
   commands:
     - pip check
     - pyflyte-execute --help