Squashed 'modules/pmi/' changes from 498bd81adc..a4bb2ff865

a4bb2ff865 PDB-Dev is now PDB-IHM
cc763452c5 Don't fail if conda is missing defaults channel

git-subtree-dir: modules/pmi
git-subtree-split: a4bb2ff8657b57709812a3bfbedff566f5efa74a

modules/pmi/pyext/src/mmcif.py

@@ -2,7 +2,7 @@
    @brief Support for the mmCIF file format.
 
    IMP has basic support for writing out files in mmCIF format, for
-   deposition in [PDB-Dev](https://pdb-dev.wwpdb.org/).
+   deposition in [PDB-IHM](https://pdb-ihm.org/).
    mmCIF files are currently generated by creating an
    IMP.pmi.mmcif.ProtocolOutput class, and attaching it to an
    IMP.pmi.representation.Representation object, after which any
@@ -1251,7 +1251,7 @@ class ProtocolOutput(IMP.pmi.output.ProtocolOutput):
     """Class to encode a modeling protocol as mmCIF.
 
     IMP has basic support for writing out files in mmCIF format, for
-    deposition in [PDB-Dev](https://pdb-dev.wwpdb.org/).
+    deposition in [PDB-IHM](https://pdb-ihm.org/).
     After creating an instance of this class, attach it to an
     IMP.pmi.topology.System object. After this, any
     generated models and metadata are automatically collected in the

modules/pmi/tools/setup_ci.sh

@@ -9,7 +9,7 @@ fi
 
 python_version=$1
 
-conda config --remove channels defaults  # get conda-forge, not main, packages
+conda config --remove channels defaults || :  # get conda-forge, not main, packages
 conda create --yes -q -n python${python_version} -c salilab -c conda-forge python=${python_version} pip scipy matplotlib imp-nightly libboost-devel gxx_linux-64 eigen cereal swig cmake
 eval "$(conda shell.bash hook)"
 conda activate python${python_version}