Skip to content

Commit

Permalink
PRICING-11953: Enable cython36 build (apache#18)
Browse files Browse the repository at this point in the history
* PRICING-11953: Enable cython36 build

* updated venv path

* updated the makefile command

* update docker and makefile

* udpate version
  • Loading branch information
rakeshcusat authored and tweise committed Aug 19, 2019
1 parent 5954345 commit 8eea0d0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
17 changes: 13 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
FROM lyft/pythonlibrary:66d815e6ba03c9515c0c2273ecca13036015715d
FROM lyft/pythonlibrary:aade5cd71241b7e490cd9d576154a013298a0892
RUN : \
&& apt-get update \
&& apt-get install -y \
python3.6 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN : \
&& virtualenv -ppython2.7 /code/venvs/venv2 \
&& virtualenv -ppython3.6 /code/venvs/venv3 \
&& /code/venvs/venv2/bin/pip install "pip==9.0.0" "setuptools==39.0.1" "cython==0.28.1" "wheel" \
&& /code/venvs/venv3/bin/pip install "pip==9.0.3" "setuptools==39.0.1" "cython==0.28.1" "wheel"
ENV PATH=/code/venvs/venv2/bin:/code/venvs/venv3/bin:$PATH
# add source to a different directory, the code root and the setup.py root
# are at different locations than lyft conventions expect
WORKDIR /src/beam
COPY . .
# Add a symlink to the setup.py code root at the lyft conventional root
RUN ln -sf /src/beam/sdks/python /code/beam
# Install the same version of cython required by beam build
RUN pip install "cython==0.28.1"
RUN \
cp \
/code/containers/pythonlibrary/Makefile \
/src/beam/manifest.yaml \
/code/beam/
1 change: 1 addition & 0 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ repository: git@github.com:lyft/beam.git
credentials: true
slack: '#noop'
team_email: 'no-reply@lyft.com'

deploy:
- name: staging
legacy: true
Expand Down
5 changes: 5 additions & 0 deletions sdks/python/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-include /code/containers/pythonlibrary/Makefile

build_dists:
/code/venvs/venv3/bin/python3.6 setup.py sdist bdist_wheel
/code/venvs/venv2/bin/python2 setup.py bdist_wheel
2 changes: 1 addition & 1 deletion sdks/python/apache_beam/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"""Apache Beam SDK version information and utilities."""


__version__ = '2.14.0.dev+lyft'
__version__ = '2.14.5.dev+lyft'

0 comments on commit 8eea0d0

Please sign in to comment.