mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-27 12:46:34 +00:00
Merge pull request #17057 from Jason2866/rm_pip
Rm pip "zopfli" install from pio script
This commit is contained in:
commit
458aa1b0b4
@ -3,14 +3,6 @@ import os
|
|||||||
import shutil
|
import shutil
|
||||||
import pathlib
|
import pathlib
|
||||||
import tasmotapiolib
|
import tasmotapiolib
|
||||||
|
|
||||||
# Upgrade pip
|
|
||||||
env.Execute("$PYTHONEXE -m pip install --upgrade pip")
|
|
||||||
# Install zopfli gz compressor from the PyPi registry
|
|
||||||
env.Execute("$PYTHONEXE -m pip install zopfli")
|
|
||||||
|
|
||||||
# Import zoepfli compress
|
|
||||||
from zopfli.gzip import compress
|
|
||||||
import gzip
|
import gzip
|
||||||
|
|
||||||
def map_gzip(source, target, env):
|
def map_gzip(source, target, env):
|
||||||
@ -39,7 +31,7 @@ if not tasmotapiolib.is_env_set(tasmotapiolib.DISABLE_MAP_GZ, env):
|
|||||||
|
|
||||||
# gzip only for ESP8266
|
# gzip only for ESP8266
|
||||||
if env["PIOPLATFORM"] != "espressif32":
|
if env["PIOPLATFORM"] != "espressif32":
|
||||||
|
from zopfli.gzip import compress
|
||||||
def bin_gzip(source, target, env):
|
def bin_gzip(source, target, env):
|
||||||
# create string with location and file names based on variant
|
# create string with location and file names based on variant
|
||||||
bin_file = tasmotapiolib.get_final_bin_path(env)
|
bin_file = tasmotapiolib.get_final_bin_path(env)
|
||||||
|
@ -110,7 +110,7 @@ build_flags = ${esp_defaults.build_flags}
|
|||||||
|
|
||||||
[core]
|
[core]
|
||||||
; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4. Added Backport for PWM selection
|
; *** Esp8266 Tasmota modified Arduino core based on core 2.7.4. Added Backport for PWM selection
|
||||||
platform = https://github.com/tasmota/platform-espressif8266/releases/download/v2.7.4.9/platform-espressif8266-2.7.4.9.zip
|
platform = https://github.com/tasmota/platform-espressif8266/releases/download/v2.7.4/platform-espressif8266-2.7.4.zip
|
||||||
platform_packages =
|
platform_packages =
|
||||||
build_unflags = ${esp_defaults.build_unflags}
|
build_unflags = ${esp_defaults.build_unflags}
|
||||||
build_flags = ${esp82xx_defaults.build_flags}
|
build_flags = ${esp82xx_defaults.build_flags}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user