ci: cleanup appveyor build pipeline

appveyor.yml → .appveyor.yml

@@ -24,14 +24,9 @@ install:
   # Check that we have the expected version and architecture for Python
   - python --version
   # Install pyjibe and its dependencies
-  - appveyor-retry python -m pip install --upgrade pip
-  # Pin version of scipy (1.5 did not work with PyInstaller 3.6?)
-  - appveyor-retry pip install "scipy<1.5.0"
-  # Pin matplotlib to 3.2.2 (https://github.com/pyinstaller/pyinstaller/issues/5004)
-  - appveyor-retry pip install "matplotlib==3.2.2"
-  # nanite needs scikit-learn>0.23.0
-  - appveyor-retry python -m pip install scikit-learn==0.23.1
-  - appveyor-retry pip install git+git://github.com/AFM-analysis/nanite.git
+  - appveyor-retry python -m pip install --upgrade pip wheel
+  # install build requirements (pinned versions of some packages)
+  - python -m pip install -r build-recipes\\win_build_requirements.txt
   - appveyor-retry pip install -e .
   # Show the installed packages
   - pip freeze
@@ -53,15 +48,13 @@ after_test:
   - python setup.py bdist_wheel
   - python setup.py sdist
   - ps: "ls dist"
-  # Install pyinstaller (includes dependency for pywin32)
-  - appveyor-retry pip install pyinstaller==3.6
   # Run pyinstaller
-  - "pyinstaller -y --log-level=WARN build-recipes\\win_pyjibe.spec"
+  - pyinstaller -y --log-level=WARN build-recipes\\win_pyjibe.spec
   # Run the binary (the most simple test)
-  - "dist\\pyjibe\\PyJibe.exe --version"
+  - dist\\pyjibe\\PyJibe.exe --version
   # Create InnoSetup installers
   # Generate iss file
-  - "python build-recipes\\win_make_iss.py"
+  - python build-recipes\\win_make_iss.py
   # Set InnoSetup path here, because Cython complained about it.
   - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"
   - iscc /Q build-recipes\\win_pyjibe.iss

build-recipes/win_build_requirements.txt

@@ -0,0 +1,11 @@
+# Any additional requirements for building the application
+# Pin matplotlib to 3.2.2 (https://github.com/pyinstaller/pyinstaller/issues/5004)
+matplotlib==3.2.2
+# https://github.com/pyinstaller/pyinstaller/issues/5004
+pyinstaller>=4.2
+# nanite needs scikit-learn>0.23.0
+scikit-learn==0.23.1
+# pyinstaller is missing a hook for the latest release of scipy
+scipy<1.5.0
+# https://github.com/pyinstaller/pyinstaller/issues/4110
+joblib>=0.14.0