Skip to content
This repository was archived by the owner on Jun 12, 2023. It is now read-only.

Commit e9babfd

Browse files
committed
Updates
* Fix base version * Pass PANDAS_VERSION to recipe
1 parent e42182d commit e9babfd

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ TAG ?= v0.25.0rc0
33
GH_USERNAME ?= TomAugspurger
44

55
PANDAS_VERSION=$(TAG:v%=%) # like 0.24.2
6-
PANDAS_BASE_VERSION=$(shell echo '0.24.2' | awk -F '.' '{OFS="."} { print $$1, $$2}') # like 0.24
6+
PANDAS_BASE_VERSION=$(shell echo $(PANDAS_VERSION) | awk -F '.' '{OFS="."} { print $$1, $$2}') # like 0.24
77
TARGZ=pandas-$(PANDAS_VERSION).tar.gz
88

99
# to ensure pushd and popd works
@@ -67,6 +67,7 @@ pandas/dist/$(TARGZ):
6767
conda-test:
6868
docker run -it --rm \
6969
--name=pandas-conda-test \
70+
--env PANDAS_VERSION=$(PANDAS_VERSION) \
7071
-v ${CURDIR}/pandas:/pandas \
7172
-v ${CURDIR}/recipe:/recipe \
7273
pandas-build \

docker-files/docs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM continuumio/miniconda3:latest
33
RUN apt-get update && apt-get install -y texlive-full xclip \
44
&& apt-get clean
55
COPY pandas /pandas
6-
RUN conda env create --file=/pandas/environment.yaml --name=pandas \
6+
RUN conda env create --file=/pandas/environment.yml --name=pandas \
77
&& . activate pandas \
88
&& conda uninstall -y --force pandas \
99
|| true python setup.py build_ext -j 4

recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "0.24.2" %}
1+
{% set version = {{ environ.get("PANDAS_VERSION") }}}
22

33
package:
44
name: pandas

0 commit comments

Comments
 (0)