COMPAT: 0.23.0 release (#25)

* COMPAT: 0.23.0 release * Fixed label
ContinuumIO · May 16, 2018 · 03d4d2f · 03d4d2f
1 parent 904249a
commit 03d4d2f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -61,7 +61,6 @@ install:
 
   # add the pandas channel *before* defaults to have defaults take priority
   - cmd: conda config --add channels conda-forge
-  - cmd: conda config --add channels pandas
   - cmd: conda config --remove channels defaults
   - cmd: conda config --add channels defaults
 
@@ -76,14 +75,14 @@ install:
   # - cmd: call setup_x64
   - cmd: conda create -q -n test-environment python=%PYTHON_VERSION% coverage cython flake8 hypothesis numpy pytest pytest-cov python-dateutil pytz six
   - cmd: activate test-environment
-  - cmd: conda install -c conda-forge/label/rc pandas>=0.23.0rc2
+  - cmd: conda install -c conda-forge pandas>=0.23.0
   - cmd: conda list -n test-environment
   - cmd: pip install --no-deps -e .
 
 test_script:
   # tests
   - cmd: pytest
-  - cmd: conda build -c defaults -c conda-forge/label/rc conda-recipes/cyberpandas --python=${PYTHON}
+  - cmd: conda build -c defaults -c conda-forge conda-recipes/cyberpandas --python=${PYTHON}
 
 on_success:
   - cmd: if "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" anaconda -t %UPLOAD_KEY% upload -u intake --force %CONDA_ROOT%\\conda-bld\\*\\*.tar.bz2
diff --git a/ci/build.sh b/ci/build.sh
@@ -2,4 +2,4 @@
 set -e
 echo "Building cyberpandas"
 
-conda build -c defaults -c conda-forge/label/rc conda-recipes/cyberpandas --python=${PYTHON}
+conda build -c defaults -c conda-forge conda-recipes/cyberpandas --python=${PYTHON}
diff --git a/ci/environment.yml b/ci/environment.yml
@@ -1,15 +1,15 @@
 name: cyberpandas-docs
 channels:
   - defaults
-  - conda-forge/label/rc
+  - conda-forge
 dependencies:
   - coverage
   - flake8
   - ipython
   - matplotlib
   - numpy
   - numpydoc
-  - pandas >=0.23.0rc2
+  - pandas >=0.23.0
   - pytest
   - pytest-cov
   - python=3.6

diff --git a/ci/install-travis.sh b/ci/install-travis.sh
@@ -38,7 +38,7 @@ conda install \
       pytz \
       six
 
-conda install -c conda-forge/label/rc pandas>=0.23.0rc2
+conda install -c conda-forge pandas>=0.23.0
 
 if [ "${PYTHON}" == "2.7" ]; then
     conda install -q ipaddress

diff --git a/conda-recipes/cyberpandas/meta.yaml b/conda-recipes/cyberpandas/meta.yaml
@@ -17,7 +17,7 @@ requirements:
 
   run:
     - ipaddress # [py27]
-    - pandas >=0.23.0rc2
+    - pandas >=0.23.0
     - python
     - setuptools >=3.3
 

diff --git a/setup.py b/setup.py
@@ -22,6 +22,6 @@
     ],
     packages=find_packages(),
     install_requires=[
-        'pandas>=0.23.0rc2',
+        'pandas>=0.23.0',
     ]
 )