Merge pull request #1533 from ocefpaf/test_split

Test split

Author: ocefpaf

.github/workflows/publish.yml

@@ -1,6 +1,12 @@
 name: Publish to PyPI
 
 on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
   release:
     types:
       - published
@@ -14,40 +20,34 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: 3.x
 
     - name: Get tags
       run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       shell: bash
 
     - name: Install build tools
       run: |
-        python -m pip install --upgrade pip wheel setuptools setuptools_scm twine "branca>=0.3.0" "jinja2>=2.9" numpy requests
+        python -m pip install --upgrade pip wheel build twine
 
       shell: bash
 
-    - name: Build binary wheel
-      run: pip wheel . -w dist --no-deps
-
-    - name: Build sdist
-      run: python setup.py sdist
+    - name: Build binary wheel and sdist
+      run: python -m build --sdist --wheel . --outdir dist
 
     - name: CheckFiles
       run: |
         ls dist
       shell: bash
 
-    - name: Check Version
-      run: |
-        python setup.py --version
-
     - name: Test wheels
       run: |
         cd dist && python -m pip install folium*.whl
         python -m twine check *
       shell: bash
 
     - name: Publish a Python distribution to PyPI
+      if: ${{ github.event_name == 'create' && github.event.ref_type == 'tag' }}
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__

.github/workflows/test_code.yml

@@ -1,20 +1,18 @@
 name: Code Tests
 
 on:
-  push:
-    branches:
-    - main
   pull_request:
-    branches:
-    - main
+  push:
+    branches: [main]
 
 jobs:
   run:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: [3.6, 3.9]
+        python-version: ["3.6", "3.9"]
+      fail-fast: false
 
     steps:
     - uses: actions/checkout@v2
@@ -23,33 +21,18 @@ jobs:
       uses: s-weigand/setup-conda@v1
       with:
         activate-conda: false
+        update-conda: true
         conda-channels: conda-forge
 
     - name: Python ${{ matrix.python-version }}
       shell: bash -l {0}
       run: |
-        conda create --yes --name TEST python=${{ matrix.python-version }} pip --file requirements.txt --file requirements-dev.txt --channel conda-forge --strict-channel-priority
+        conda create --yes --name TEST python=${{ matrix.python-version }} pip --file requirements.txt --file requirements-dev.txt
         source activate TEST
         pip install -e . --no-deps --force-reinstall
 
-    - name: Tarball tests
-      shell: bash -l {0}
-      run: |
-        source activate TEST
-        pip wheel . -w dist --no-deps
-        check-manifest --verbose
-        twine check dist/*
-
     - name: Tests
       shell: bash -l {0}
       run: |
         source activate TEST
         pytest -vv --ignore=tests/selenium
-
-    - name: Tests with latest branca
-      shell: bash -l {0}
-      run: |
-        source activate TEST
-        conda remove branca --yes
-        pip install git+https://github.com/python-visualization/branca.git
-        pytest -vv --ignore=tests/selenium

.github/workflows/test_latest_branca.yml

@@ -0,0 +1,35 @@
+name: Code Tests with Latest branca
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Conda
+      uses: s-weigand/setup-conda@v1
+      with:
+        activate-conda: false
+        update-conda: true
+        conda-channels: conda-forge
+
+    - name: Python 3.x
+      shell: bash -l {0}
+      run: |
+        conda create --yes --name TEST python=3 pip --file requirements.txt --file requirements-dev.txt
+        source activate TEST
+        pip install -e . --no-deps --force-reinstall
+
+    - name: Tests with latest branca
+      shell: bash -l {0}
+      run: |
+        source activate TEST
+        conda remove branca --yes
+        pip install git+https://github.com/python-visualization/branca.git
+        pytest -vv --ignore=tests/selenium

.github/workflows/test_selenium.yml

@@ -15,14 +15,14 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Conda setup
-      uses: s-weigand/setup-conda@v1.0.5
+      uses: s-weigand/setup-conda@v1
       with:
         update-conda: true
 
     - name: Conda environment creation
       shell: bash -l {0}
       run: |
-        conda create --yes --name TEST python=3.9 pip --file requirements.txt --file requirements-dev.txt --channel conda-forge --strict-channel-priority
+        conda create --yes --name TEST python=3 pip --file requirements.txt --file requirements-dev.txt --channel conda-forge --strict-channel-priority
         source activate TEST
         pip install -e . --no-deps --force-reinstall