Skip to content

Conversation

@dhalbert
Copy link
Contributor

@dhalbert dhalbert commented Nov 1, 2018

Put .frozen before lib/ in sys.path only if necessary, and only if both are in sys.path. This allows testing of non-frozen libraries in /, and does not adjust the path if .frozen is already before /lib.

@dhalbert dhalbert requested a review from kattni November 1, 2018 19:42
Copy link
Contributor

@kattni kattni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent, thank you for updating this.

@kattni
Copy link
Contributor

kattni commented Nov 1, 2018

I'll merge once you get Travis passing.

@kattni kattni merged commit f4ee725 into adafruit:master Nov 1, 2018
tannewt pushed a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Nov 2, 2018
Updating https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground to 2.0.4 from 2.0.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_CircuitPlayground#42 from dhalbert/frozen-order

Updating https://github.com/adafruit/Adafruit_CircuitPython_Crickit to 2.1.2 from 2.1.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_Crickit#10 from dhalbert/frozen-order
  > ignore the board module imports in .pylintrc

Updating https://github.com/adafruit/Adafruit_CircuitPython_LIS3DH to 4.3.3 from 4.3.2:
  > Update spinner_advanced.py
  > Merge pull request adafruit/Adafruit_CircuitPython_LIS3DH#47 from adafruit/ladyada-patch-2

Updating https://github.com/adafruit/Adafruit_CircuitPython_Thermistor to 3.2.1 from 3.2.0:
  > ignore the board module imports in .pylintrc

Updating https://github.com/adafruit/Adafruit_CircuitPython_BusDevice to 2.2.6 from 2.2.5:
  > ignore the board module imports in .pylintrc

Updating https://github.com/adafruit/Adafruit_CircuitPython_HID to 3.3.0 from 3.2.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_HID#27 from dhalbert/gui-alt-key-aliases

Updating https://github.com/adafruit/Adafruit_CircuitPython_Motor to 1.3.2 from 1.3.1:
  > ignore the board module imports in .pylintrc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants