mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-22 11:43:51 +01:00 
			
		
		
		
	Fix docker installs using old platformio version (#125)
* Fix min platformio version and update requirements * Remove unnecessary requirements from travis
This commit is contained in:
		| @@ -4,7 +4,7 @@ python: | |||||||
|   - "2.7" |   - "2.7" | ||||||
| install: | install: | ||||||
|   - pip install -r requirements.txt |   - pip install -r requirements.txt | ||||||
|   - pip install tornado esptool flake8==3.5.0 pylint==1.8.4 tzlocal pillow |   - pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow | ||||||
| script: | script: | ||||||
|  - flake8 esphomeyaml |  - flake8 esphomeyaml | ||||||
|  - pylint esphomeyaml |  - pylint esphomeyaml | ||||||
|   | |||||||
| @@ -10,17 +10,13 @@ EXPOSE 6123 | |||||||
| VOLUME /config | VOLUME /config | ||||||
| WORKDIR /usr/src/app | WORKDIR /usr/src/app | ||||||
|  |  | ||||||
| COPY requirements.txt /usr/src/app/ |  | ||||||
| RUN pip install --no-cache-dir -r requirements.txt && \ |  | ||||||
|     pip install --no-cache-dir tornado esptool |  | ||||||
|  |  | ||||||
| COPY docker/platformio.ini /usr/src/app/ | COPY docker/platformio.ini /usr/src/app/ | ||||||
| RUN platformio settings set enable_telemetry No && \ | RUN platformio settings set enable_telemetry No && \ | ||||||
|     platformio run -e espressif32 -e espressif8266; exit 0 |     platformio run -e espressif32 -e espressif8266; exit 0 | ||||||
|  |  | ||||||
| COPY . . | COPY . . | ||||||
| RUN pip install --no-cache-dir -e . && \ | RUN pip install --no-cache-dir -e . && \ | ||||||
|     pip install --no-cache-dir tzlocal |     pip install --no-cache-dir tzlocal pillow | ||||||
|  |  | ||||||
| WORKDIR /config | WORKDIR /config | ||||||
| ENTRYPOINT ["esphomeyaml"] | ENTRYPOINT ["esphomeyaml"] | ||||||
|   | |||||||
| @@ -3,4 +3,4 @@ FROM python:2.7 | |||||||
| COPY requirements.txt /requirements.txt | COPY requirements.txt /requirements.txt | ||||||
|  |  | ||||||
| RUN pip install -r /requirements.txt && \ | RUN pip install -r /requirements.txt && \ | ||||||
|     pip install flake8==3.5.0 pylint==1.8.4 tzlocal pillow |     pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| voluptuous==0.11.1 | voluptuous>=0.11.1 | ||||||
| platformio==3.5.2 | platformio>=3.5.3 | ||||||
| pyyaml==3.12 | pyyaml>=3.12 | ||||||
| paho-mqtt==1.3.1 | paho-mqtt>=1.3.1 | ||||||
| colorlog==3.1.2 | colorlog>=3.1.2 | ||||||
| tornado==5.0.2 | tornado>=5.0.0 | ||||||
| esptool==2.3.1 | esptool>=2.3.1 | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
									
									
									
									
								
							| @@ -23,7 +23,7 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__) | |||||||
|  |  | ||||||
| REQUIRES = [ | REQUIRES = [ | ||||||
|     'voluptuous>=0.11.1', |     'voluptuous>=0.11.1', | ||||||
|     'platformio>=3.5.2', |     'platformio>=3.5.3', | ||||||
|     'pyyaml>=3.12', |     'pyyaml>=3.12', | ||||||
|     'paho-mqtt>=1.3.1', |     'paho-mqtt>=1.3.1', | ||||||
|     'colorlog>=3.1.2', |     'colorlog>=3.1.2', | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user