Skip to content

Commit 3db5cbe

Browse files
committed
Merge branch 'release/v1.12.4'
2 parents cf6ada5 + a5cda5d commit 3db5cbe

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: python
22
python:
33
- "2.7"
4-
- "3.5"
4+
- "3.6"
55

66
env:
77
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink

examples/arduino-external-libs/platformio.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
; http://docs.platformio.org/page/projectconf.html
99

1010
[common]
11-
lib_deps = Adafruit 9DOF Library
11+
lib_deps =
12+
Adafruit 9DOF Library
13+
Ethernet
1214

1315
[env:uno]
1416
platform = atmelavr

platform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-atmelavr.git"
1414
},
15-
"version": "1.12.3",
15+
"version": "1.12.4",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",

platform.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,11 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from os import getenv
16-
1715
from platformio.managers.platform import PlatformBase
1816

1917

2018
class AtmelavrPlatform(PlatformBase):
2119

22-
@property
23-
def package_repositories(self):
24-
repositories = super(AtmelavrPlatform, self).package_repositories or []
25-
if getenv("CI", "false").lower() == "true":
26-
repositories = [
27-
"https://sourceforge.net/projects/platformio-storage/"
28-
"files/packages/manifest.json"
29-
] + repositories
30-
return repositories
31-
3220
def configure_default_packages(self, variables, targets):
3321
if not variables.get("board"):
3422
return super(AtmelavrPlatform, self).configure_default_packages(

0 commit comments

Comments
 (0)