Skip to content

Commit 96cc1ff

Browse files
committed
Use the current git clone in conda recipe.
Also use git-based version data to version conda package.
1 parent 0a05e5c commit 96cc1ff

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

conda-recipe/bld.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ if errorlevel 1 exit 1
33

44
:: Add more build steps here, if they are necessary.
55

6-
:: See
7-
:: http://docs.continuum.io/conda/build.html
6+
"%PYTHON%" setup.py --version > __conda_version__.txt
7+
8+
:: See http://docs.continuum.io/conda/build.html
89
:: for a list of environment variables that are set during the build process.

conda-recipe/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $PYTHON setup.py install
44

55
# Add more build steps here, if they are necessary.
66

7-
# See
8-
# http://docs.continuum.io/conda/build.html
7+
$PYTHON setup.py --version > __conda_version__.txt
8+
9+
# See http://docs.continuum.io/conda/build.html
910
# for a list of environment variables that are set during the build process.

conda-recipe/meta.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package:
22
name: diffpy.utils
3-
version: 1.1.post10
3+
## Use __conda_version__.txt.
4+
# version: 1.1.post12
45

56
source:
6-
git_url: https://github.com/diffpy/diffpy.utils
7-
git_rev: 14087b2295e9f8053e26b480caedbe79f7955215
8-
# patches:
9-
# List any patch files here
10-
# - fix.patch
7+
# git_url: https://github.com/diffpy/diffpy.utils
8+
git_url: ..
119

1210
build:
1311
preserve_egg_dir: True

0 commit comments

Comments
 (0)