Fix conda build workflow and script (#1295)

Summary:
This broke due to the changes in #1292.

Pull Request resolved: #1295

Reviewed By: saitcakmak

Differential Revision: D37735815

Pulled By: Balandat

fbshipit-source-id: 359820fc20efdd8abeea0cdbd9be4a595db76dcb

Author: Balandat

.conda/build_conda.sh

@@ -4,7 +4,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-BOTORCH_VERSION="$(python ../setup.py --version)"
+# we cannot use relative paths here, since setuptools_scm options in
+# pyproject.toml cannot dynamically determine the root dir
+cd .. || exit
+BOTORCH_VERSION="$(python setup.py --version)"
 export BOTORCH_VERSION
+cd .conda || exit
 
 conda build .

.conda/meta.yaml

@@ -20,7 +20,7 @@ requirements:
     - pytorch >=1.9
     - gpytorch >=1.6
     - scipy
-    - pyro-ppl 1.8.0
+    - pyro-ppl >=1.8.0
 
 test:
   imports:

.github/workflows/deploy_on_release.yml

@@ -86,7 +86,7 @@ jobs:
         conda install -y scipy sphinx pytest flake8
         conda install -y -c gpytorch gpytorch
         conda install -y conda-build anaconda-client
-        conda install -y -c conda-forge pyro-ppl==1.8.0
+        conda install -y -c conda-forge pyro-ppl>=1.8.0
         conda config --set anaconda_upload no
     - name: Build and verify conda package
       shell: bash -l {0}

.github/workflows/nightly.yml

@@ -91,13 +91,13 @@ jobs:
       run: git fetch --prune --unshallow
     - name: Install dependencies
       shell: bash -l {0}
-      # Don't need deps for conda build, but need them for testing
+      # Don't need most deps for conda build, but need them for testing
+      # We do need setuptools_scm though to properly parse the version
       run: |
-        conda install -y conda-build
+        conda install -y scipy setuptools_scm conda-build conda-verify
         conda config --set anaconda_upload no
         conda install -y -c pytorch-nightly pytorch cpuonly
-        conda install -y scipy
-        conda install -y -c conda-forge pyro-ppl==1.8.0
+        conda install -y -c conda-forge pyro-ppl>=1.8.0
         pip install git+https://github.com/cornellius-gp/gpytorch.git
     - name: Build and verify conda package
       shell: bash -l {0}

.github/workflows/test_stable.yml

@@ -48,7 +48,7 @@ jobs:
         conda install -y -c pytorch pytorch cpuonly
         conda install -y pip scipy pytest
         conda install -y -c gpytorch gpytorch
-        conda install -y -c conda-forge pyro-ppl==1.8.0
+        conda install -y -c conda-forge pyro-ppl>=1.8.0
         pip install .[test]
     - name: Unit tests
       shell: bash -l {0}

docs/getting_started.md

@@ -18,7 +18,7 @@ Before jumping the gun, we recommend you start with the high-level
 - gpytorch >= 1.6
 - scipy
 - multiple-dispatch
-- pyro-ppl == 1.8.0
+- pyro-ppl >= 1.8.0
 
 BoTorch is easily installed via
 [Anaconda](https://www.anaconda.com/distribution/#download-section) (recommended)

environment.yml

@@ -7,4 +7,4 @@ dependencies:
   - pytorch>=1.9
   - gpytorch>=1.6
   - scipy
-  - pyro-ppl=1.8.0
+  - pyro-ppl>=1.8.0

scripts/build_and_verify_conda_package.sh

@@ -4,13 +4,13 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-cd .conda || exit
-
 # Get version number (created dynamically via setuptools-scm)
-BOTORCH_VERSION=$(python ../setup.py --version)
+BOTORCH_VERSION=$(python setup.py --version)
 # Export env var (this is used in .conda/meta.yaml)
 export BOTORCH_VERSION
 
+cd .conda || exit
+
 # build package
 cur_dir="$(pwd)"
 build_dir="${cur_dir}/conda_build"

setup.py

@@ -85,7 +85,7 @@
         "gpytorch>=1.6",
         "scipy",
         "multipledispatch",
-        "pyro-ppl==1.8.0",
+        "pyro-ppl>=1.8.0",
     ],
     extras_require={
         "dev": DEV_REQUIRES,