Merge from 5.x: PR #17347

spyder-ide · Feb 17, 2022 · 4941d21 · 4941d21
2 parents 1a58e21 + d2dca68
commit 4941d21
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/.github/workflows/installer-win.yml b/.github/workflows/installer-win.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         build_type: ['Lite', 'Full']
     env:
-      ASSETS_URL: 'https://github.com/spyder-ide/windows-installer-assets/releases/download/0.0.5/assets.zip'
+      ASSETS_URL: 'https://github.com/spyder-ide/windows-installer-assets/releases/download/0.0.6/assets.zip'
       UNWANTED_PACKAGES: ${{github.event_name == 'pull_request' && 'pip spyder-kernels python-slugify Rtree QDarkStyle PyNaCl' || 'pip python-slugify Rtree PyNaCl' }}
       SKIP_PACKAGES: 'bcrypt slugify'
       ADD_PACKAGES: ${{github.event_name == 'pull_request' && 'spyder_kernels blib2to3 _black_version blackd rtree qdarkstyle nacl' || 'blib2to3 _black_version blackd rtree nacl' }}

diff --git a/installers/Windows/installer.py b/installers/Windows/installer.py
@@ -99,7 +99,6 @@
     ntsecuritycon
     {packages}
 files={package_dist_info} > $INSTDIR/pkgs
-    black-20.8b1.dist-info > $INSTDIR/pkgs
     __main__.py > $INSTDIR/pkgs/jedi/inference/compiled/subprocess
     __init__.py > $INSTDIR/pkgs/pylint
     lib
@@ -340,13 +339,6 @@ def run(python_version, bitness, repo_root, entrypoint, package, icon_path,
                 prefix="installer-pynsist-") as work_dir:
             print("Temporary working directory at", work_dir)
 
-            # NOTE: SHOULD BE TEMPORAL (until black has wheels available).
-            # See the 'files' section on the pynsist template config too.
-            print("Copying dist.info for black-20.8b1")
-            shutil.copytree(
-                "installers/Windows/assets/black/black-20.8b1.dist-info",
-                os.path.join(work_dir, "black-20.8b1.dist-info"))
-
             # NOTE: SHOULD BE TEMPORAL (until jedi has the fix available).
             # See the 'files' section on the pynsist template config too.
             print("Copying patched CompiledSubprocess __main__.py for jedi")

diff --git a/installers/Windows/req-extras-pull-request.txt b/installers/Windows/req-extras-pull-request.txt
@@ -10,8 +10,7 @@ rope
 yapf
 
 # Scientific packages (for Same as Spyder)
-# Ping NumPy version to 1.19.3 do message error on Windows
-numpy==1.19.3
+numpy
 scipy
 pandas
 matplotlib
@@ -24,7 +23,3 @@ sympy
 
 # There are no wheels for version 3.3
 cryptography==3.2.1
-
-# Workaround for black 22 until we release a new version of
-# pylsp-black
-black==21.12b0
diff --git a/installers/Windows/req-extras-release.txt b/installers/Windows/req-extras-release.txt
@@ -10,8 +10,7 @@ rope
 yapf
 
 # Scientific packages (for Same as Spyder)
-# Ping NumPy version to 1.19.3 do message error on Windows
-numpy==1.19.3
+numpy
 scipy
 pandas
 matplotlib