Merge pull request #18548 from dalthviz/default_win_installer_assets

PR: Change default installers assets download URL (Windows)
spyder-ide · Jul 5, 2022 · a626f8d · a626f8d
2 parents 2129d3c + dd368e6
commit a626f8d
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/installer-macos.yml b/.github/workflows/installer-macos.yml
@@ -1,6 +1,14 @@
 on:
   pull_request:
     paths:
+      - 'installers/macOS/**'
+      - '.github/workflows/installer-macos.yml'
+      - 'requirements/*.yml'
+      - 'MANIFEST.in'
+      - '**.bat'
+      - '**.py'
+      - '**.sh'
+      - '!**.md'
       - '!installers/Windows/**'
       - '!.github/workflows/installer-win.yml'
 

diff --git a/.github/workflows/installer-win.yml b/.github/workflows/installer-win.yml
@@ -2,6 +2,14 @@
 on:
   pull_request:
     paths:
+      - 'installers/Windows/**'
+      - '.github/workflows/installer-win.yml'
+      - 'requirements/*.yml'
+      - 'MANIFEST.in'
+      - '**.bat'
+      - '**.py'
+      - '**.sh'
+      - '!**.md'
       - '!installers/macOS/**'
       - '!.github/workflows/installer-macos.yml'
 
@@ -19,7 +27,6 @@ jobs:
       matrix:
         build_type: ['Lite', 'Full']
     env:
-      ASSETS_URL: '/~https://github.com/spyder-ide/windows-installer-assets/releases/download/0.0.7/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/.github/workflows/test-files.yml b/.github/workflows/test-files.yml
@@ -9,7 +9,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'
@@ -25,7 +25,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -9,7 +9,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'
@@ -25,7 +25,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'

diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -9,7 +9,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'
@@ -25,7 +25,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'

diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -9,7 +9,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'
@@ -25,7 +25,7 @@ on:
     paths:
       - '.github/scripts/*.sh'
       - '.github/workflows/*.yml'
-      - 'requirements/*.txt'
+      - 'requirements/*.yml'
       - 'MANIFEST.in'
       - '**.bat'
       - '**.py'

diff --git a/installers/Windows/README.md b/installers/Windows/README.md
@@ -70,7 +70,7 @@ pip install yarg
 
 Before running the `installer.py` script, you must set first some environment variables. The list below shows all the variables that must be created:
 - URL to download assets that the installer needs and that will be put on the assets directory when building the installer.
-	 - `ASSETS_URL=/~https://github.com/spyder-ide/windows-installer-assets/releases/download/0.0.7/assets.zip`
+	 - `ASSETS_URL=/~https://github.com/spyder-ide/windows-installer-assets/releases/latest/download/assets.zip`
 
     Note: *This link points to the repository where the assets/extra files used by the installer construction process can be found and are being managed.*
 - Packages to remove from the requirements for example pip or external direct dependencies (e.g. python-lsp-server or spyder-kernels).

diff --git a/installers/Windows/installer.py b/installers/Windows/installer.py
@@ -41,7 +41,7 @@
 ASSETS_URL = os.environ.get(
     'ASSETS_URL',
     '/~https://github.com/spyder-ide/windows-installer-assets/'
-    'releases/download/0.0.1/assets.zip')
+    'releases/latest/download/assets.zip')
 
 # Packages to remove from the requirements for example pip or
 # external direct dependencies (python-lsp-server spyder-kernels)