mirror of
				https://github.com/python-pillow/Pillow.git
				synced 2025-11-04 09:57:43 +03:00 
			
		
		
		
	Merge pull request #7880 from radarhere/cygwin
This commit is contained in:
		
						commit
						786ded02e8
					
				
							
								
								
									
										20
									
								
								.github/workflows/test-cygwin.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.github/workflows/test-cygwin.yml
									
									
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -50,7 +50,7 @@ jobs:
 | 
			
		|||
        uses: actions/checkout@v4
 | 
			
		||||
 | 
			
		||||
      - name: Install Cygwin
 | 
			
		||||
        uses: egor-tensin/setup-cygwin@v4
 | 
			
		||||
        uses: cygwin/cygwin-install-action@v4
 | 
			
		||||
        with:
 | 
			
		||||
          packages: >
 | 
			
		||||
            gcc-g++
 | 
			
		||||
| 
						 | 
				
			
			@ -71,7 +71,6 @@ jobs:
 | 
			
		|||
            make
 | 
			
		||||
            netpbm
 | 
			
		||||
            perl
 | 
			
		||||
            python39=3.9.16-1
 | 
			
		||||
            python3${{ matrix.python-minor-version }}-cffi
 | 
			
		||||
            python3${{ matrix.python-minor-version }}-cython
 | 
			
		||||
            python3${{ matrix.python-minor-version }}-devel
 | 
			
		||||
| 
						 | 
				
			
			@ -89,21 +88,15 @@ jobs:
 | 
			
		|||
 | 
			
		||||
      - name: Select Python version
 | 
			
		||||
        run: |
 | 
			
		||||
          ln -sf c:/tools/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/tools/cygwin/bin/python3
 | 
			
		||||
 | 
			
		||||
      - name: Get latest NumPy version
 | 
			
		||||
        id: latest-numpy
 | 
			
		||||
        shell: bash.exe -eo pipefail -o igncr "{0}"
 | 
			
		||||
        run: |
 | 
			
		||||
          python3 -m pip list --outdated | grep numpy | sed -r 's/ +/ /g' | cut -d ' ' -f 3 | sed 's/^/version=/' >> $GITHUB_OUTPUT
 | 
			
		||||
          ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
 | 
			
		||||
 | 
			
		||||
      - name: pip cache
 | 
			
		||||
        uses: actions/cache@v4
 | 
			
		||||
        with:
 | 
			
		||||
          path: 'C:\cygwin\home\runneradmin\.cache\pip'
 | 
			
		||||
          key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-${{ hashFiles('.ci/install.sh') }}
 | 
			
		||||
          key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
 | 
			
		||||
          restore-keys: |
 | 
			
		||||
            ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-
 | 
			
		||||
            ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
 | 
			
		||||
 | 
			
		||||
      - name: Build system information
 | 
			
		||||
        run: |
 | 
			
		||||
| 
						 | 
				
			
			@ -113,11 +106,6 @@ jobs:
 | 
			
		|||
        run: |
 | 
			
		||||
          bash.exe .ci/install.sh
 | 
			
		||||
 | 
			
		||||
      - name: Upgrade NumPy
 | 
			
		||||
        shell: dash.exe -l "{0}"
 | 
			
		||||
        run: |
 | 
			
		||||
          python3 -m pip install -U "numpy<1.26"
 | 
			
		||||
 | 
			
		||||
      - name: Build
 | 
			
		||||
        shell: bash.exe -eo pipefail -o igncr "{0}"
 | 
			
		||||
        run: |
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -702,7 +702,7 @@ class Image:
 | 
			
		|||
                    pass
 | 
			
		||||
                else:
 | 
			
		||||
                    if parse_version(numpy.__version__) < parse_version("1.23"):
 | 
			
		||||
                        warnings.warn(e)
 | 
			
		||||
                        warnings.warn(str(e))
 | 
			
		||||
            raise
 | 
			
		||||
        new["shape"], new["typestr"] = _conv_type_shape(self)
 | 
			
		||||
        return new
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user