Remove unused production requirements #93
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Splits dependencies for production and development
timewsync/__init__.py
Outdated
| @@ -123,7 +128,7 @@ def main(): | |||
| log.addHandler(info_handler) | |||
|
|
|||
| # Error logging | |||
| red_formatter = logging.Formatter(Fore.RED + "%(levelname)s: %(message)s" + Fore.RESET) | |||
| red_formatter = logging.Formatter("\u001b[31m" + "%(levelname)s: %(message)s" + "\u001b[0m") | |||
There was a problem hiding this comment.
Hmm, if we have colorama as a dependency anyways, we might as well use Fore for better readability imo.
There was a problem hiding this comment.
I guess you are right. I was thinking about removing colorama altogether but did like the colored text which of course needs to work on Windows as well (without gibberish).
I'll change that back now.
timewsync/auth.py
Outdated
| @@ -57,6 +58,6 @@ def generate_jwt(priv_key: jwk.JWK, user_id: int) -> str: | |||
| """ | |||
| payload = {"userID": user_id} | |||
|
|
|||
| token = jwt.generate_jwt(payload, priv_key, "RS256", lifetime=datetime.timedelta(minutes=1)) | |||
| token = jwt.encode(payload, priv_key, algorithm="RS256", headers={"alg": "RS256", "typ": "JWT"}) | |||
There was a problem hiding this comment.
Suggested change
| token = jwt.encode(payload, priv_key, algorithm="RS256", headers={"alg": "RS256", "typ": "JWT"}) | |
| token = jwt.encode(payload, priv_key, algorithm="RS256") |
Are you sure these headers need to be specified? Some preliminary testing on my local machine has shown that these headers are automatically added.
There was a problem hiding this comment.
Yes, you are right!
This was because of failing tests, but the reason was something unrelated.
- Uses keys in PEM format - Update tests
- pytest (reason: moved to requirements-dev.txt) - py (reasons: maintenance mode, unused) - attrs (reason: unused) - pluggy (reason: moved to requirements-dev.txt) - iniconfig (reason: moved to requirements-dev.txt) - black (reason: moved to requirements-dev.txt) - jwcrypto 1.5 -> 1.5.6 (reason: improved security) - python_jwt -> pyjwt (reason: deprecated) - six (reason: unused, also Python 2 support got dropped long ago)
joachimschmidt557
approved these changes
Apr 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes unused dependencies from the project #36.
Splits dependencies for production and development into
requirements.txtandrequirements-dev.txt, respectively.Please use
requirements-dev.txtfor development and testing.Switches from
python_jwttopyjwt, because the former is deprecated.The following packets in
requirements.txtare removed/changed:This droppes support for Python 2, which had end-of-life for a long time.