force xarray!=0.13.0

because of pydata/xarray#3317
Chilipp · Sep 18, 2019 · aae3842 · aae3842
1 parent 6d5df84
commit aae3842
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -68,6 +68,7 @@ install:
         conda update -q conda
         conda install anaconda-client conda-build
         conda info -a
+    - if [[ $TRAVIS_TAG == "" ]]; then export GIT_BRANCH=$TRAVIS_BRANCH; fi
     - reset_secure
 script:
     - unset_secure

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,10 +2,10 @@ environment:
     matrix:
         - PYTHON: "C:\\Miniconda36-x64"
           PYTHON_ARCH: "64"
-          PYTHON_VERSION: 3.6
+          PYTHON_VERSION: 3.7
         - PYTHON: "C:\\Miniconda36-x64"
           PYTHON_ARCH: "64"
-          PYTHON_VERSION: 3.7
+          PYTHON_VERSION: 3.6
 
 install:
     - "SET ORIGPATH=%PATH%"
@@ -16,6 +16,7 @@ install:
     - conda install conda-build anaconda-client
     - conda info -a
     - 'SET PYTHONWARNINGS=ignore:mode:DeprecationWarning:docutils.io:245'
+    - "IF NOT DEFINED APPVEYOR_REPO_TAG_NAME (SET GIT_BRANCH=%APPVEYOR_REPO_BRANCH%)"
 
 build: off
 

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "psy-strat" %}
-{% set version = "0.1.0" %}
+{% set version = "0.1.1" %}
 
 package:
   name: {{ name|lower }}
@@ -9,18 +9,21 @@ source:
   path: ../
 
 build:
-  number: 0
-  script: python setup.py install --single-version-externally-managed --record record.txt
+  number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
+  string: {{ environ.get('GIT_BUILD_STR', '') }}{% if environ.get('GIT_BRANCH') %}_{{ environ.get('GIT_BRANCH').replace('-', '') }}{% endif %}
+  script: python -m pip install . --no-deps --ignore-installed -vvv
+  skip: true  # [py == 27]
 
 requirements:
   build:
     - python
-    - setuptools
+    - pip
   run:
     - python
-    - psy-simple>=1.2.0
-    - psyplot>=1.2.0
-    - numpy>=1.14  # [win]
+    - psy-simple >=1.2.0
+    - psyplot >=1.2.0
+    - numpy >=1.14  # [win]
+    - xarray !=0.13.1
 
 test:
   requires:
@@ -34,7 +37,7 @@ test:
   imports:
     - psy_strat
   commands:
-    - pytest -v --cov=psy_strat -v
+    - pytest -v --cov=psy_strat
     - codecov
 
 

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@ def run_tests(self):
 
 
 setup(name='psy-strat',
-      version='0.1.0',
+      version='0.1.1',
       description='A psyplot plugin for stratigraphic plots',
       long_description=readme(),
       classifiers=[
@@ -41,11 +41,8 @@ def run_tests(self):
         'Topic :: Scientific/Engineering :: Visualization',
         'Topic :: Scientific/Engineering',
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Operating System :: OS Independent',
       ],
       keywords='visualization psyplot pollen',
@@ -57,6 +54,7 @@ def run_tests(self):
       install_requires=[
           'psyplot>=1.2.0',
           'psy-simple>=1.2.0',
+          'xarray!=0.13.0',
       ],
       tests_require=['pytest'],
       cmdclass={'test': PyTest},