Skip to content
Permalink
Browse files

Fix SETUP.md random string & psutil install

Merges #182

Update SETUP.md to replace the correct random string

Fix missing x86_64-conda_cos6-linux-gnu-gcc in psutil install by installing
psutil using conda.

.travis.yml: one configuration option per line (non-functional whitespace change)
  • Loading branch information...
slochower authored and dhimmel committed Feb 28, 2019
1 parent 2a4c813 commit 717630e7fa73f0388f1de9231db4f90f1e984888
Showing with 5 additions and 2 deletions.
  1. +3 −1 .travis.yml
  2. +1 −1 SETUP.md
  3. +1 −0 build/environment.yml
@@ -10,7 +10,9 @@ before_install:
- bash miniconda.sh -b -p $HOME/miniconda
- source $HOME/miniconda/etc/profile.d/conda.sh
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda config
--set always_yes yes
--set changeps1 no
install:
- conda env create --quiet --file build/environment.yml
- conda list --name manubot
@@ -113,7 +113,7 @@ The following command automates this substitution.
TRAVIS_ENCRYPT_ID=`python -c "import re; \
text = open('travis-encrypt-file.log').read(); \
print(re.search('encrypted_([a-f0-9]+)_key', text).group(1))"`
sed "s/f2f00aaf6402/$TRAVIS_ENCRYPT_ID/g" deploy.sh > tmp && mv -f tmp deploy.sh
sed "s/9befd6eddffe/$TRAVIS_ENCRYPT_ID/g" deploy.sh > tmp && mv -f tmp deploy.sh
```

Next, limit [concurrent](https://blog.travis-ci.com/2014-07-18-per-repository-concurrency-setting/) Travis CI jobs to ensure previous builds deploy before subsequent ones begin:
@@ -11,6 +11,7 @@ dependencies:
- conda-forge::pandas=0.24.0
- conda-forge::pandoc=2.6
- conda-forge::pango=1.40.14
- conda-forge::psutil=5.5.1
- conda-forge::python=3.6.7
- conda-forge::pyyaml=3.13
- conda-forge::requests=2.21.0

0 comments on commit 717630e

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.