From d73eab57a34ecb40d3aed9f3c10ec9e0d7931128 Mon Sep 17 00:00:00 2001 From: Shannon Osborne Date: Mon, 22 Jun 2020 08:14:56 -0700 Subject: [PATCH 1/2] fix indentation in travis file --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e0c90ac..85e04d9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ deploy: username: "__token__" password: secure: ehTNpPSitppZJINBslbzT6bT+/woUTqpO/TATvMxHr+Czv6AgXyX1OZ/XFbNQKTe1Uh+fmPgIeDCh4/21xvFye6jYx9SBu5NyGTFVnFx4Fg1eEGtIkqY113qcACZKfEW/L1yFltto77QSEZwQpVKfgWG6uj2g/0/FrcB8uS3/kFbMxzHbEwE2o/+ff9wDpEA57EOMVWOEqnR6cmQJJCqvVDBNigb9ncQuhMvn6A1u2twTHXLmmUnJJ5vT3h8UUK+9VX4Q2g32RznJUQOidVJ8CLNbcyF4hKhfDRQsO9/OUAbdpW5xj5kLE8r6bHEZ3NTQgr3ZNuAe7/GvMWLeB7wRy5O1FTV+1Tltgp4QzOX+sl460g1iAUus78NvLKRlid9QjjE9aiNYEqoyXJc1O50lm4jWe12qQ1Do8JJNJZX8H7KH/foRqAmTyEkS6jOOXmepLeVOzOP+IrVXHfFp5RJCbhsDjODoSR9IWWzkZsb4nNcUcoLTAnfqpPY5NDQateq5TUqV/tGUG9+fvqH8kZFte0l8qBNrj2mDwTBb1weurucIzCV1MJYTSsjZBkdcBypqrslllza0qYwFi0IEDl3lIX4rz7yN8eczswUzsxL5svgHFXdZEwUqyAnvF7E6qX498o6nWwSfgRrLI+QQGa/sM/PfJa4NEjbdnn5EXRzak0= - on: - branch: stable - tags: true - skip_existing: true + on: + branch: stable + tags: true + skip_existing: true From c20c328fe7cbaccfe89fa516cd720f749ae16be1 Mon Sep 17 00:00:00 2001 From: Shannon Osborne Date: Mon, 22 Jun 2020 08:42:18 -0700 Subject: [PATCH 2/2] update legacy numpy version (matches webbpsf now) --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d2fc3f65..b97383f6 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = cov: pytest-cov cov: coverage cov: codecov - legacy: numpy==1.13.* + legacy: numpy==1.16.* legacy: astropy==3.2.* astropydev: git+git://github.com/astropy/astropy numexpr: numexpr>=2.0.0