Merge branch 'main' into pre-commit-ci-update-config

pytroll · Aug 15, 2023 · 46db48f · 46db48f
2 parents 984c092 + 085f968
commit 46db48f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -89,12 +89,12 @@ jobs:
         # We must get LD_PRELOAD for stdlibc++ or else the manylinux wheels
         # may break the conda-forge libraries trying to use newer glibc versions
         run: |
+          python -m pip install --pre --upgrade --no-deps numpy; \
           python -m pip install \
           --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/ \
           --trusted-host pypi.anaconda.org \
           --no-deps --pre --upgrade \
           matplotlib \
-          numpy \
           pandas \
           scipy; \
           python -m pip install \

diff --git a/.github/workflows/deploy-sdist.yaml b/.github/workflows/deploy-sdist.yaml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Publish package to PyPI
         if: github.event.action == 'published'
-        uses: pypa/[email protected].8
+        uses: pypa/[email protected].10
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}