Clean up

[skip ci]
holoviz · Apr 9, 2024 · 654dabe · 654dabe
1 parent 58be583
commit 654dabe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,7 +16,6 @@ defaults:
     shell: bash -l {0}
 
 env:
-  SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
   PYTHON_VERSION: "3.11"
   PACKAGE: "datashader"
   MPLBACKEND: "Agg"
@@ -28,8 +27,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [conda_build, pip_install]
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    # environment:
-    #   name: publish
+    environment:
+      name: publish
     steps:
       - run: echo "All builds have finished, have been approved, and ready to publish"
 
@@ -80,14 +79,14 @@ jobs:
       - name: conda setup
         run: |
           conda install -y anaconda-client
-      # - name: conda dev upload
-      #   if: contains(env.TAG, 'a') || contains(env.TAG, 'b') || contains(env.TAG, 'rc')
-      #   run: |
-      #     anaconda --token ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --user pyviz --label=dev $CONDA_FILE
-      # - name: conda main upload
-      #   if: (!(contains(env.TAG, 'a') || contains(env.TAG, 'b') || contains(env.TAG, 'rc')))
-      #   run: |
-      #     anaconda --token ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --user pyviz --label=dev --label=main $CONDA_FILE
+      - name: conda dev upload
+        if: contains(env.TAG, 'a') || contains(env.TAG, 'b') || contains(env.TAG, 'rc')
+        run: |
+          anaconda --token ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --user pyviz --label=dev $CONDA_FILE
+      - name: conda main upload
+        if: (!(contains(env.TAG, 'a') || contains(env.TAG, 'b') || contains(env.TAG, 'rc')))
+        run: |
+          anaconda --token ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --user pyviz --label=dev --label=main $CONDA_FILE
 
   pip_build:
     name: Build PyPI
@@ -140,9 +139,9 @@ jobs:
         with:
           name: pip
           path: dist/
-      # - name: Publish to PyPI
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     user: ${{ secrets.PPU }}
-      #     password: ${{ secrets.PPP }}
-      #     repository-url: "https://upload.pypi.org/legacy/"
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: ${{ secrets.PPU }}
+          password: ${{ secrets.PPP }}
+          repository-url: "https://upload.pypi.org/legacy/"
diff --git a/scripts/conda/build.sh b/scripts/conda/build.sh
@@ -4,7 +4,6 @@ set -euxo pipefail
 
 git status
 
-export SETUPTOOLS_ENABLE_FEATURES="legacy-editable"
 python -m build -w .
 
 git diff --exit-code