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.

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

Gracefully handle empty stop time #418

Merged
merged 5 commits into from
Mar 26, 2021
Merged

Gracefully handle empty stop time #418

merged 5 commits into from
Mar 26, 2021

Conversation

komputerwiz
Copy link
Contributor

Candidate solution for #417.

@komputerwiz
Copy link
Contributor Author

In hindsight, probably should've implemented a test case for handling empty stop time to prevent possible future regression. Please let me know if you would like me to update the PR.

@jmaupetit
Copy link
Contributor

Wonderful!

In hindsight, probably should've implemented a test case for handling empty stop time to prevent possible future regression.

Yes please 🙏

@komputerwiz
Copy link
Contributor Author

Test implemented! I wasn't exactly sure where to put it, so I placed it next to other tests related to currently-running frames. I guess more importantly, it reports red prior to 81738a6 and green after.

@jmaupetit
Copy link
Contributor

Thanks! One last thing: can you please fill the CHANGELOG to mention this fix. I'll release this asap. 🙏

@Link-
Copy link

Link- commented Mar 24, 2021

@komputerwiz I created a pull-request on your fork with the changelog updates: https://github.com/komputerwiz/Watson/pull/1

If you can merge it to this branch and push the changes here we'll be good to go 👍

Add 2.0.1 hotfix release details
@komputerwiz
Copy link
Contributor Author

@jmaupetit Apologies for not seeing your message from yesterday until now. I have merged @Link- 's pull request (thanks for the help!), so everything should be good to go!

Copy link
Contributor

@jmaupetit jmaupetit left a comment

Choose a reason for hiding this comment

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

Almost good to go. Keep it up!

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@komputerwiz
Copy link
Contributor Author

Thanks for the review! I've modified the CHANGELOG according to your suggestions.

Copy link
Contributor

@jmaupetit jmaupetit left a comment

Choose a reason for hiding this comment

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

Yay 🎉

@jmaupetit jmaupetit merged commit edf9fef into jazzband:master Mar 26, 2021
jmaupetit added a commit that referenced this pull request May 10, 2021
Fixed:

- Ability to `edit` the current frame (#418)
@jmaupetit jmaupetit mentioned this pull request May 10, 2021
jmaupetit added a commit that referenced this pull request May 10, 2021
Fixed:

- Ability to `edit` the current frame (#418)
veganjay pushed a commit to veganjay/Watson that referenced this pull request May 15, 2021
Recent arrow library update broke the current frame edition.
veganjay pushed a commit to veganjay/Watson that referenced this pull request May 15, 2021
Fixed:

- Ability to `edit` the current frame (jazzband#418)
samtx added a commit to samtx/Watson that referenced this pull request Apr 17, 2022
* Resolve Issue jazzband#407: Migrate to arrow 1.0.0

- requirements.txt: specify arrow==1.00
- frames.py, fullmoon.py, watson.py: change "timestamp" to
  "int_timestamp"

* Resolve Issue jazzband#407: Migrate to arrow 1.0.0

- cli.py: change "date.tzinfo = tz.tzlocal()" to "date.replace(tzinfo=tz.tzlocal())"

* Update requirements.txt

This makes sense, especially given that arrow is already up to 1.0.2

Co-authored-by: Julien Maupetit <jmaupetit@users.noreply.github.com>

* Resolve Issue jazzband#407: Migrate to arrow 1.0.0

- watson.cli.py: use date = date.replace(tzinfo=tz.tzlocal())
  (date.replace does not modify the existing object)

* Resolve Issue jazzband#407: Migrate to arrow 1.0.0

Update unit test cases:

- tests/test_cli.py: replace arrow.arrow.datetime with arrow.arrow.dt_datetime
- tests/test_watson.py: replace .timestamp with .int_timestamp

* Resolve Issue jazzband#407: Migrate to arrow 1.0.0

- .travis.yml: remove python 3.5
- setup.py: require python >= 3.6
- CHANGELOG.md: mention arrow upgrade and drop of python 3.5 support

* Update watson.zsh-completion

fix: autocompletion won't work with zsh 5.8

* Use TZ environment variable to set the timezone (jazzband#411)

Watson did not have a way to set the timezone, other than what the system used.
In UNIX you can set the TZ variable to represent the timezone you want your
programs to respect.

* Bump release to 2.0.0

Added:

- The `log` command output can now be filtered to exclude projects and
  tags via `--ignore-project` and `--ignore-tag` (jazzband#395)
- Python 3.8 support (jazzband#402)
- Python 3.9 support (jazzband#402)
- Support for the TZ environment variable to specify the local time zone
  (jazzband#391)

Changed:

- Upgrade to major arrow release 1.0.0 (jazzband#407)

Fixed:

- Zsh completion (jazzband#379)

Removed:

- Python 2.7 support (jazzband#305).
- Python 3.5 support (jazzband#407).

* Fix year in 2.0.0 release

Believe it or not its 2021!

* Gracefully handle empty stop time (jazzband#418)

Recent arrow library update broke the current frame edition.

* Bump release to 2.0.1

Fixed:

- Ability to `edit` the current frame (jazzband#418)

* Add 'notes' field to frames.

This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>

* notes: Print notes in `watson log`.

* notes: Fix tests.

* Set requirements for click >= 8.0 and rename autocompletion parameter to shell_complete. Remove 'multiple' paramater on reporting option

Co-authored-by: Jason Youzwak <jyouzwak@perspectalabs.com>
Co-authored-by: veganjay <veganjay@gmail.com>
Co-authored-by: Julien Maupetit <jmaupetit@users.noreply.github.com>
Co-authored-by: Nikolay Shkrylev <snnwolf@users.noreply.github.com>
Co-authored-by: Eddie Ash <cazador481@users.noreply.github.com>
Co-authored-by: Julien Maupetit <julien@maupetit.net>
Co-authored-by: Matthew Barry <komputerwiz.matt@gmail.com>
Co-authored-by: Rohitt Vashishtha <aero31aero@gmail.com>
Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants