mirror of
				https://github.com/nvbn/thefuck.git
				synced 2025-10-31 15:12:20 +00:00 
			
		
		
		
	test_fish.py: use official python images, not ubuntu
This should help reduce build times.
This commit is contained in:
		| @@ -2,19 +2,20 @@ import pytest | |||||||
| from tests.functional.plots import with_confirmation, without_confirmation, \ | from tests.functional.plots import with_confirmation, without_confirmation, \ | ||||||
|     refuse_with_confirmation, select_command_with_arrows |     refuse_with_confirmation, select_command_with_arrows | ||||||
|  |  | ||||||
| containers = (('thefuck/ubuntu-python3-fish', | containers = (('thefuck/python3-fish', | ||||||
|                u'''FROM ubuntu:latest |                u'''FROM python:3 | ||||||
|  |                    # Use jessie-backports since it has the fish package. See here for details: | ||||||
|  |                    # https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile | ||||||
|  |                    RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list | ||||||
|                    RUN apt-get update |                    RUN apt-get update | ||||||
|                    RUN apt-get install -yy python3 python3-pip python3-dev fish git |  | ||||||
|                    RUN pip3 install -U setuptools |  | ||||||
|                    RUN ln -s /usr/bin/pip3 /usr/bin/pip |  | ||||||
|                    RUN apt-get install -yy fish''', |                    RUN apt-get install -yy fish''', | ||||||
|                u'fish'), |                u'fish'), | ||||||
|               ('thefuck/ubuntu-python2-fish', |               ('thefuck/python2-fish', | ||||||
|                u'''FROM ubuntu:latest |                u'''FROM python:2 | ||||||
|  |                    # Use jessie-backports since it has the fish package. See here for details: | ||||||
|  |                    # https://github.com/tianon/docker-brew-debian/blob/88ae21052affd8a14553bb969f9d41c464032122/jessie/backports/Dockerfile | ||||||
|  |                    RUN awk '$1 ~ "^deb" { $3 = $3 "-backports"; print; exit }' /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list | ||||||
|                    RUN apt-get update |                    RUN apt-get update | ||||||
|                    RUN apt-get install -yy python python-pip python-dev git |  | ||||||
|                    RUN pip2 install -U pip setuptools |  | ||||||
|                    RUN apt-get install -yy fish''', |                    RUN apt-get install -yy fish''', | ||||||
|                u'fish')) |                u'fish')) | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user