Skip to content
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

Jmashon/working branch #5

Merged
merged 44 commits into from
Jul 25, 2024
Merged

Jmashon/working branch #5

merged 44 commits into from
Jul 25, 2024

Conversation

jmashon
Copy link
Collaborator

@jmashon jmashon commented Jul 16, 2024

No description provided.

jmashon and others added 30 commits July 10, 2024 14:13
@jmashon
Do not merge literally so broken
25369f7
@jmashon
Merge branch 'jmashon/working-branch' of github.com:FarmBot-Labs/side…
f7c512a 
…car-starter-pack into jmashon/working-branch
@jmashon
removed __pycache__
28a444f
@jmashon
combined several files, removed api imports in broker.py
16bccfa
@jmashon
get_token() in main.py now sets: self.token, api.token, broker.token
a3fae43
@jmashon
Organized into separate files
64ff603
@jmashon
Updated imports
ad624da
@jmashon
Changed some stuff around--connect() not working
298901d
@jmashon
Fixed broker_connect.py issue
377efd7
@jmashon
Added a few functions
72d269e
@jmashon
Has token persistence issue from main.py -> broker_connect.py
d41defc
@jmashon
Added initial listen/subscribe to channel(s) features
1504b4c
Added functions to main.py and broker_functions.py--on_connect() take…
6a0bff7 
…s no arguments
Fixed test_get_token() for updated code
59f178b
Fixed test_get_info() and removed outdated tests
937fb17
Reverted unit testing and updated test_get_token_default_server()
3ebdf5d
Bookmark
6ce47e8
@gabrielburnworth
[tests] remove unused imports
0715dd6
@gabrielburnworth
[tests] move function descriptions into docstrings
0b7d52f
@gabrielburnworth
[tests] fix get_token mocks
7e66dd2
@gabrielburnworth
[tests] add original tests back in
5b7a9fb
@gabrielburnworth
[tests] add in expected errors
1167b21
Has listen(duration)--working, not implemented
229f1fa
@gabrielburnworth
[tests] change to mock request to follow code change
be1a680
@gabrielburnworth
[tests] change mock token location to align with code change
fbacafc
@gabrielburnworth
[tests] align expected call with actual
4ca3aa3
@gabrielburnworth
[tests] align expected response with actual
2ff5b02
Added get_xyz()
5d7caa2
@gabrielburnworth
Merge branch 'jmashon/working-branch' of https://github.com/FarmBot-L…
2acdd1a 
…abs/sidecar-starter-pack into jmashon/working-branch
Added comments--organization
8b3d149
@roryaronson roryaronson merged commit eedce48 into main Jul 25, 2024
4 checks passed
@jmashon jmashon deleted the jmashon/working-branch branch July 25, 2024 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jmashon @roryaronson @gabrielburnworth