/synapse

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

Already on GitHub? Sign in to your account

python_dependencies: Use bcrypt module instead of py-bcrypt #2288

Merged
merged 1 commit into from Aug 23, 2017

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@kyrias @matrixbot @richvdh @erikjohnston
@kyrias
Contributor

kyrias commented Jun 17, 2017

py-bcrypt has been unmaintained for a long while, while bcrypt is
actively maintained. And since ff8b871
we're compatible with the bcrypt anyway.

This allows distro maintainer to drop the unmaintained module which also
happens to conflict with the bcrypt module.
@kyrias
python_dependencies: Use bcrypt module instead of py-bcrypt 
py-bcrypt has been unmaintained for a long while, while bcrypt is
actively maintained. And since ff8b871
we're compatible with the bcrypt anyway.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
4f66312
@matrixbot

matrixbot commented Jun 17, 2017

Can one of the admins verify this patch?
@matrixbot

matrixbot commented Jun 17, 2017

Can one of the admins verify this patch?
@matrixbot

matrixbot commented Jun 17, 2017

Can one of the admins verify this patch?
@kyrias
Contributor

kyrias commented Jun 22, 2017

oy-oy?
@richvdh
Member

richvdh commented Aug 23, 2017

@erikjohnston this looks like the right solution?
@erikjohnston
Owner

erikjohnston commented Aug 23, 2017

Probably?
@richvdh
Member

richvdh commented Aug 23, 2017

this should avoid things like #2345 in future.

@richvdh richvdh merged commit a7effa8 into matrix-org:develop Aug 23, 2017
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@richvdh
Member

richvdh commented Aug 23, 2017

(Thanks @kyrias)

@kyrias kyrias deleted the kyrias:bcrypt branch Aug 23, 2017

richvdh added a commit to matrix-org/sytest that referenced this pull request Aug 23, 2017

@richvdh
Set bcrypt_rounds = 4 
to stop breakage occuring with modern python bcrypt.

(We now use bcrypt 3 in synapse, as of
matrix-org/synapse#2288)

All checks have passed

2 successful checks
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
01b25c9

richvdh added a commit to matrix-org/sytest that referenced this pull request Aug 23, 2017

@richvdh
Set bcrypt_rounds = 4 
to stop breakage occuring with modern python bcrypt.

(We now use bcrypt 3 in synapse, as of
matrix-org/synapse#2288)

All checks have passed

2 successful checks
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
c546212

@richvdh richvdh referenced this pull request in matrix-org/sytest Aug 23, 2017

Merged

Set bcrypt_rounds = 4 #372

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment