Merge branch 'master' of https://github.com/CODAIT/text-extensions-for-pandas into branch-binder

Author: frreiss

.travis.yml

@@ -1,34 +1,34 @@
 language: python
-python:
-- "3.7"
 
 jobs:
   include:
+    - python: "3.6"
     - name: "Pandas 1.0.x"
+      python: "3.7"
       env: PANDAS_VERSION=1.0.*
     - name: "Pandas 1.1.x"
+      python: "3.7"
       env: PANDAS_VERSION=1.1.*
 
 install:
-#install conda
- - sudo apt-get update
- - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- - 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 update -q conda
+  #install conda
+  - sudo apt-get update
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+  - 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 update -q conda
 
- - conda info -a
+  - conda info -a
 
- - CONDA_HOME="${HOME}/miniconda" ./env.sh
+  - CONDA_HOME="${HOME}/miniconda" ./env.sh
 
 
 script:
-
- #activate python virtual environment
- - conda activate pd
- #check that doc generation is possible
- - ./generate_docs.sh
- #run unit tests 
- - pytest -v text_extensions_for_pandas
+  #activate python virtual environment
+  - conda activate pd
+  #check that doc generation is possible
+  - ./generate_docs.sh
+  #run unit tests
+  - pytest -v text_extensions_for_pandas

README.md

@@ -75,7 +75,11 @@ To run the notebooks on your local machine, follow the following steps:
 1. Navigate to the `notebooks` directory and choose any of the notebooks there
 
 
+<<<<<<< HEAD
 **API documentation** can be found at [https://readthedocs.org/projects/text-extensions-for-pandas/](https://readthedocs.org/projects/text-extensions-for-pandas/).
+=======
+API documentation can be found at [https://text-extensions-for-pandas.readthedocs.io/en/latest/](https://text-extensions-for-pandas.readthedocs.io/en/latest/)
+>>>>>>> 73bedd82ff67d33c9858511e551902e8d6da8061
 
 
 ## Contents of this repository