Update changelog in preparation for new release (#307)

intake · Dec 18, 2020 · 3eb28ae · 3eb28ae
1 parent dd3e7fd
commit 3eb28ae
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,6 +13,7 @@ on:
 jobs:
   build:
     name: python-${{ matrix.python-version }}
+    if: github.repository == 'intake/intake-esm'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -27,6 +28,7 @@ jobs:
         with:
           channels: conda-forge
           mamba-version: '*'
+          channel-priority: strict
           activate-environment: intake-esm-dev
           auto-update-conda: false
           python-version: ${{ matrix.python-version }}
@@ -52,6 +54,7 @@ jobs:
 
   upstream-dev:
     name: upstream-dev
+    if: github.repository == 'intake/intake-esm'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -62,6 +65,7 @@ jobs:
         with:
           channels: conda-forge
           mamba-version: '*'
+          channel-priority: strict
           activate-environment: intake-esm-dev
           auto-update-conda: false
           python-version: 3.8

diff --git a/.github/workflows/pythonpublish.yml → .github/workflows/pypi.yml b/.github/workflows/pythonpublish.yml → .github/workflows/pypi.yml
@@ -1,26 +1,27 @@
-name: Upload Python Package
+name: Publish intake-esm to PyPI
 
 on:
   release:
-    types: [created]
+    types:
+      - published
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: '3.x'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools setuptools-scm wheel twine
+          python -m pip install setuptools setuptools-scm wheel twine
       - name: Build and publish
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python setup.py sdist bdist_wheel
-          twine upload dist/*
+           python -m twine upload dist/* --skip-existing
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## Intake-esm v2020.12.18
+
+([full changelog](https://github.com/intake/intake-esm/compare/4f63319294fc7d8394a7c89680ca3525ca1b0d54...dd3e7fdbd752a9e26030ccc7c03e571adb3d3be1))
+
+### Bug Fixes
+
+- 🐛 Disable `_requested_variables` for single variable assets [#306](https://github.com/intake/intake-esm/pull/306) ([@andersy005](https://github.com/andersy005))
+
+### Internal Changes
+
+- Update changelog in preparation for new release [#307](https://github.com/intake/intake-esm/pull/307) ([@andersy005](https://github.com/andersy005))
+- Use `github-activity` to update list of contributors [#302](https://github.com/intake/intake-esm/pull/302) ([@andersy005](https://github.com/andersy005))
+- Add nbqa & Update prettier commit hooks [#300](https://github.com/intake/intake-esm/pull/300) ([@andersy005](https://github.com/andersy005))
+- Update pre-commit and GH actions [#299](https://github.com/intake/intake-esm/pull/299) ([@andersy005](https://github.com/andersy005))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/intake/intake-esm/graphs/contributors?from=2020-11-05&to=2020-12-19&type=c))
+
+[@andersy005](https://github.com/search?q=repo%3Aintake%2Fintake-esm+involves%3Aandersy005+updated%3A2020-11-05..2020-12-19&type=Issues) | [@dcherian](https://github.com/search?q=repo%3Aintake%2Fintake-esm+involves%3Adcherian+updated%3A2020-11-05..2020-12-19&type=Issues) | [@jbusecke](https://github.com/search?q=repo%3Aintake%2Fintake-esm+involves%3Ajbusecke+updated%3A2020-11-05..2020-12-19&type=Issues) | [@naomi-henderson](https://github.com/search?q=repo%3Aintake%2Fintake-esm+involves%3Anaomi-henderson+updated%3A2020-11-05..2020-12-19&type=Issues) | [@Recalculate](https://github.com/search?q=repo%3Aintake%2Fintake-esm+involves%3ARecalculate+updated%3A2020-11-05..2020-12-19&type=Issues)
+
 ## Intake-esm v2020.11.4
 
 ### Features