Skip to content

added check to see if location was None before getting timezone #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Nov 19, 2020
Merged

added check to see if location was None before getting timezone #48

merged 3 commits into from
Nov 19, 2020

Conversation

slootsky
Copy link
Contributor

added check to see if location was None before getting timezone from secrets

previously, if a location parameter was supplied, it was overwritten by the value in secrets.

@tannewt tannewt requested a review from makermelissa November 11, 2020 19:46
makermelissa
makermelissa requested changes Nov 11, 2020
View reviewed changes
Copy link
Collaborator

@makermelissa makermelissa left a comment

Choose a reason for hiding this comment

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

Hi could you fix the errors? You will likely need to pip3 install pre-commit and then run it. Otherwise this makes sense in that it will prioritize the passed in location over the secrets one.

@slootsky
Copy link
Contributor Author

okay, I think that got it. thanks for the tips on how to complete it.

@ladyada ladyada requested a review from makermelissa November 19, 2020 18:32
makermelissa
makermelissa approved these changes Nov 19, 2020
View reviewed changes
Copy link
Collaborator

@makermelissa makermelissa left a comment

Choose a reason for hiding this comment

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

Thanks, looks good.

@makermelissa makermelissa merged commit 02baa6d into adafruit:master Nov 19, 2020
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Nov 24, 2020
@adafruit-adabot
Automated update by Adabot (adafruit/adabot@665d9ae)
ecb00ef 
Updating https://github.com/adafruit/Adafruit_CircuitPython_Fingerprint to 2.1.1 from 2.1.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_Fingerprint#25 from jerryneedell/jerryn_r503_save

Updating https://github.com/adafruit/Adafruit_CircuitPython_LIS3DH to 5.1.6 from 5.1.5:
  > Merge pull request adafruit/Adafruit_CircuitPython_LIS3DH#65 from caternuson/iss64

Updating https://github.com/adafruit/Adafruit_CircuitPython_RPLIDAR to 1.1.3 from 1.1.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_RPLIDAR#11 from kevin-balkoski-enview/typo-fixes

Updating https://github.com/adafruit/Adafruit_CircuitPython_AdafruitIO to 5.0.2 from 5.0.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_AdafruitIO#55 from DougBurke/patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font to 1.2.3 from 1.2.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_Bitmap_Font#30 from FoamyGuy/magtag_example

Updating https://github.com/adafruit/Adafruit_CircuitPython_Display_Shapes to 2.0.3 from 2.0.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_Display_Shapes#28 from FoamyGuy/add_magtag_example

Updating https://github.com/adafruit/Adafruit_CircuitPython_MatrixPortal to 1.9.5 from 1.9.4:
  > Merge pull request adafruit/Adafruit_CircuitPython_MatrixPortal#52 from makermelissa/master
  > Merge pull request adafruit/Adafruit_CircuitPython_MatrixPortal#48 from slootsky/feature/get_local_time_ignores_location_parameter

Updating https://github.com/adafruit/Adafruit_CircuitPython_Slideshow to 1.5.0 from 1.4.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_Slideshow#27 from FoamyGuy/text_slides
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makermelissa makermelissa makermelissa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@slootsky @makermelissa