From 63adc1b5e587adc4e8c2edd5852a5411148998dc Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 13 Jul 2022 18:01:47 +0200 Subject: [PATCH 1/5] change requirements to pypi format, remove ESP32SPI requirement --- requirements.txt | 3 +-- setup.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 386b869..c3abac8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,5 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka -Adafruit_CircuitPython_ESP32SPI adafruit-circuitpython-esp-atcontrol -adafruit_circuitpython_requests +adafruit-circuitpython-requests diff --git a/setup.py b/setup.py index f632e44..e065180 100644 --- a/setup.py +++ b/setup.py @@ -35,9 +35,8 @@ author_email="circuitpython@adafruit.com", install_requires=[ "Adafruit-Blinka", - "Adafruit_CircuitPython_ESP32SPI", "adafruit-circuitpython-esp-atcontrol", - "adafruit_circuitpython_requests", + "adafruit-circuitpython-requests", ], # Choose your license license="MIT", From fd53ef5c5f0ba2496da57369f596042d0d630ef6 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 13 Jul 2022 18:33:45 +0200 Subject: [PATCH 2/5] add back ESP32SPI to pypi install --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e065180..912adcb 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ author_email="circuitpython@adafruit.com", install_requires=[ "Adafruit-Blinka", + "Adafruit_CircuitPython_ESP32SPI", "adafruit-circuitpython-esp-atcontrol", "adafruit-circuitpython-requests", ], From 0029d503a636340f93493173c6b2374e7765568d Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 13 Jul 2022 18:44:41 +0200 Subject: [PATCH 3/5] add optional requirements --- optional_requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 optional_requirements.txt diff --git a/optional_requirements.txt b/optional_requirements.txt new file mode 100644 index 0000000..49562ea --- /dev/null +++ b/optional_requirements.txt @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2022 Adafruit Industries +# +# SPDX-License-Identifier: Unlicense + +adafruit-circuitpython-esp32spi From 7081b784ed8505cf6bb02f2539302818fcea930a Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 13 Jul 2022 18:49:59 +0200 Subject: [PATCH 4/5] move adafruit-circuitpython-esp-atcontrol to optional --- optional_requirements.txt | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/optional_requirements.txt b/optional_requirements.txt index 49562ea..5b5e9c7 100644 --- a/optional_requirements.txt +++ b/optional_requirements.txt @@ -3,3 +3,4 @@ # SPDX-License-Identifier: Unlicense adafruit-circuitpython-esp32spi +adafruit-circuitpython-esp-atcontrol diff --git a/requirements.txt b/requirements.txt index c3abac8..1c0cc14 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,4 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka -adafruit-circuitpython-esp-atcontrol adafruit-circuitpython-requests From a027c0cc2209af3f0c06748ed603eb093bfce70f Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 17 Aug 2022 12:04:39 -0400 Subject: [PATCH 5/5] Correct optional_requirements.txt to remove dependencies --- optional_requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/optional_requirements.txt b/optional_requirements.txt index 5b5e9c7..d4e27c4 100644 --- a/optional_requirements.txt +++ b/optional_requirements.txt @@ -1,6 +1,3 @@ -# SPDX-FileCopyrightText: 2022 Adafruit Industries +# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries # # SPDX-License-Identifier: Unlicense - -adafruit-circuitpython-esp32spi -adafruit-circuitpython-esp-atcontrol