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

Enhancement/#676 remove python version check #677

Merged
merged 8 commits into from Oct 5, 2020
Merged

Enhancement/#676 remove python version check #677

merged 8 commits into from Oct 5, 2020

Conversation

andrewmiko
Copy link
Contributor

Removed client_version_info from project.

  1. isort show sorting error in file which I didn't edited
  2. flake8 throws tons of errors on local env
  3. Didn't update Pipfile only because it's trying to upgrade all packages (it's ignoring --keep-outdated flag)

I can update PR later with all necessary changes.

Closes #676

Copy link
Collaborator

@Askaholic Askaholic left a comment

Choose a reason for hiding this comment

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

@Brutus5000 Thoughts on keeping the user agent check?

server/lobbyconnection.py Outdated Show resolved Hide resolved
tests/integration_tests/test_server.py Outdated Show resolved Hide resolved
@Askaholic
Copy link
Collaborator

Oh and I can take care of the Pipfile and Pipfile.lock in a separate PR. That's no problem

Copy link
Collaborator

@Askaholic Askaholic left a comment

Choose a reason for hiding this comment

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

Another thing I just noticed was that there are references to the version_lobby table in our test-data.sql file. We should remove those too so our tests don't break when the table is dropped.

And you'll need to rebase.

@andrewmiko
Copy link
Contributor Author

@Askaholic

OK, I'm first time doing rebase and I need little help here.

Current branch is ahead of develop to 10 commits:

Should I go back to 10 commits and squash them? git rebase -i HEAD~10
Then push --force

Right?

@Askaholic
Copy link
Collaborator

Askaholic commented Oct 5, 2020

Sorry for taking so long to respond, somehow I overlooked this.

I usually do this:

$ git checkout develop
$ git pull upstream develop
$ git checkout my-branch
$ git rebase develop
$ git push --force

Where upstream is the remote that points to this repository (the FAForever one, not my fork). I'm not entirely sure what the interaction with merge commits is here, because I never make any, but I would expect them to just disappear during the rebase.

You shouldn't need to squash anything, and after the rebase you should be left with just the commits that you made, except that they will have been moved to be the most recent commits in the commit history.

@andrewmiko
Copy link
Contributor Author

@Askaholic Thanks a lot. Today I will finish it then. 👍

Copy link
Collaborator

@Askaholic Askaholic left a comment

Choose a reason for hiding this comment

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

Looks good!

@Askaholic Askaholic merged commit d5edd67 into FAForever:develop Oct 5, 2020
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.

Remove python client version check
3 participants