Switched version passing from environment to variant.yaml.

Author: Eli

.github/workflows/python-package-conda.yml

@@ -29,23 +29,26 @@ jobs:
         conda create -n test_dms_datastore -y conda-build conda-verify numpy anaconda-client
         source $CONDA/etc/profile.d/conda.sh
         conda activate test_dms_datastore
+
         pip install setuptools_scm
 
         git fetch --force --tags
-        echo "HEAD: $(git rev-parse HEAD)"
         echo "Describe: $(git describe --tags --dirty --always || true)"
 
         PKG_VERSION=$(python -m setuptools_scm | sed 's/+/-/g')
         echo "Building version: $PKG_VERSION"
 
-        if [ -z "$PKG_VERSION" ] || [ "$PKG_VERSION" = "0.0.0" ]; then
-          echo "ERROR: Bad PKG_VERSION='$PKG_VERSION' (missing tags or setuptools_scm failure)"
+        if [ -z "$PKG_VERSION" ] || [ "$PKG_VERSION" = "0.0.0" ] || [ "$PKG_VERSION" = "None" ]; then
+          echo "ERROR: Bad PKG_VERSION='$PKG_VERSION'"
           exit 1
         fi
 
+        echo "PKG_VERSION: $PKG_VERSION" > conda.recipe/variant.yaml
+        cat conda.recipe/variant.yaml
+
         conda config --set anaconda_upload yes
-        PKG_VERSION=$PKG_VERSION conda build -c cadwr-dms -c conda-forge --user cadwr-dms --token "$ANACONDA_CHANNEL_UPLOAD_TOKEN" conda.recipe
+
+        conda build -m conda.recipe/variant.yaml -c cadwr-dms -c conda-forge --user cadwr-dms --token "$ANACONDA_CHANNEL_UPLOAD_TOKEN" conda.recipe
 
         conda deactivate
         conda remove -n test_dms_datastore --all -y
-

conda.recipe/meta.yaml

@@ -2,11 +2,15 @@
 {% set python_version = pyproject['project']['requires-python'] %}
 {% set setup_data = load_setup_py_data() %}
 
+
+
 package:
   name: dms-datastore
   # Use the environment variable passed from the shell
   # Set via: export PKG_VERSION=$(python -m setuptools_scm)
-  version: {{ environ['PKG_VERSION'] }}
+  #version: {{ environ['PKG_VERSION'] }}
+  version: {{ PKG_VERSION }}
+
 
 source:
   path: ..