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

clean: update and fix sentry dependency #455

Merged
merged 4 commits into from
Jul 30, 2024
Merged

clean: update and fix sentry dependency #455

merged 4 commits into from
Jul 30, 2024

Conversation

bolinocroustibat
Copy link
Contributor

@bolinocroustibat bolinocroustibat commented Jul 23, 2024 •
edited
Loading

  • Update Sentry dependency to match the backend one, and fix dependencies conflicts.

This goes with the PR opendatateam/udata#3086. This backend PR should be merged before that one.

In order to pass CI tests even though the backend is not merged yet, the file udata-front/requirements/udata.in was temporarily edited from:
udata@git+https://github.com/opendatateam/udata.git -> udata@git+https://github.com/opendatateam/udata.git@update-sentry
It should be edited back to the original after back PR has been merged and before we merge this.

@bolinocroustibat bolinocroustibat changed the title clean: remove sentry dependency clean: update and fix sentry dependency Jul 23, 2024
maudetes
maudetes reviewed Jul 24, 2024
View reviewed changes
requirements/install.pip Outdated
# via -r requirements/install.in
sgmllib3k==1.0.0
# via feedparser
urllib3==1.25.11
urllib3==1.26.19
Copy link
Contributor

Choose a reason for hiding this comment

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

Make sure to apply pip-tools to all requirements files. Should be configured in pre-commit :)

maudetes
maudetes approved these changes Jul 30, 2024
View reviewed changes
Copy link
Contributor

@maudetes maudetes left a comment

Choose a reason for hiding this comment

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

We're ready to merge this since its udata counterpart has been merged! ;)
You can try recomputing deps just to make sure we're okay since there has been multiple deps PR!

@bolinocroustibat
Squashed commit of the following:
8804f24 
commit 06f4dde
Author: Nicolas KEMPF <[email protected]>
Date:   Tue Jul 30 15:51:34 2024 +0200

    Use udata master (#465)

    * chore: use udata master

    * ci: use new import-fixtures command

commit dab670a
Author: Nicolas Kempf Le Stanc <[email protected]>
Date:   Tue Jul 30 13:43:38 2024 +0200

    Update to version 5.1.1.dev for next development cycle

commit 61f7a32
Author: Nicolas Kempf Le Stanc <[email protected]>
Date:   Tue Jul 30 13:42:02 2024 +0200

    Bump version 5.1.0

commit dd04341
Author: Nicolas KEMPF <[email protected]>
Date:   Tue Jul 30 11:12:58 2024 +0200

    Use udata release for next udata-front release (#464)

    * chore: use udata release

commit fb7b6ae
Author: Nicolas KEMPF <[email protected]>
Date:   Tue Jul 30 09:24:19 2024 +0200

    Use datagouv/components v1.1.1 (#462)

    * chore : use released datagouv/components

commit be7c8cf
Author: Nicolas Kempf Le Stanc <[email protected]>
Date:   Mon Jul 29 17:56:48 2024 +0200

    Bump version @datagouv/[email protected]

commit 92b56bb
Author: Nicolas KEMPF <[email protected]>
Date:   Mon Jul 29 17:34:27 2024 +0200

    Prevent components publishing without dist (#463)

    * chore: add prepublishOnly to prevent publishing without dist

commit 7609fe6
Author: Nicolas KEMPF <[email protected]>
Date:   Mon Jul 29 17:16:59 2024 +0200

    Update datagouv/components changelog (#461)

    * Update datagouv/components changelog

commit 65b628a
Author: Nicolas Kempf Le Stanc <[email protected]>
Date:   Mon Jul 29 14:47:41 2024 +0200

    Bump version @datagouv/[email protected]

commit d07dea6
Author: maudetes <[email protected]>
Date:   Mon Jul 29 14:30:01 2024 +0200

    New Crowdin updates (#459)

    * New translations gouvfr.pot (Serbian (Latin))

    * New translations gouvfr.pot (French)

    * New translations en.json (French)

    * New translations en.json (French)

    * New translations gouvfr.pot (Spanish)

    * New translations en.json (Spanish)

    * New translations en.json (Spanish)

    * New translations gouvfr.pot (German)

    * New translations en.json (German)

    * New translations en.json (German)

    * New translations gouvfr.pot (Italian)

    * New translations en.json (Italian)

    * New translations en.json (Italian)

    * New translations gouvfr.pot (Portuguese)

    * New translations en.json (Portuguese)

    * New translations en.json (Portuguese)

    * New translations en.json (Serbian (Cyrillic))

    * New translations gouvfr.pot (Serbian (Latin))

    * New translations en.json (Serbian (Latin))

    * New translations gouvfr.pot (Serbian (Cyrillic))

    * Update source file gouvfr.pot

    * Update source file en.json

    * Update source file en.json

    * New translations gouvfr.pot (French)

    * New translations en.json (French)

    * New translations en.json (French)

    * New translations gouvfr.pot (Serbian (Latin))

    * New translations gouvfr.pot (Serbian (Cyrillic))

    ---------

    Co-authored-by: Nicolas Kempf Le Stanc <[email protected]>

commit 51dfe49
Author: Nicolas KEMPF <[email protected]>
Date:   Mon Jul 29 13:18:38 2024 +0200

    Update translations (#458)

    * chore: i18n

commit 3766b3b
Author: Nicolas KEMPF <[email protected]>
Date:   Mon Jul 29 10:11:09 2024 +0200

    Use @datagouv component (#439)

    * chore: use @datagouv/components

    * feat: use latest version

    * feat: update config for preview

    ---------

    Co-authored-by: maudetes <[email protected]>
    Co-authored-by: Thibaud Dauce <[email protected]>

commit 139665b
Author: maudetes <[email protected]>
Date:   Mon Jul 29 10:10:42 2024 +0200

    New Crowdin updates (#425)

commit 4b1f264
Author: Thibaud Dauce <[email protected]>
Date:   Mon Jul 29 08:06:05 2024 +0200

    Add captchetat to reset route (#456)

    * Add captchetat to reset route

    * Remove captcha_code / captcha_id from required data

commit 519ec80
Merge: c86bbcb 36ee13b
Author: Adrien Carpentier <[email protected]>
Date:   Thu Jul 25 13:59:18 2024 +0200

    Merge pull request #457 from datagouv/update-gitignore

    fix: update .gitignore

commit 36ee13b
Author: Adrien Carpentier <[email protected]>
Date:   Thu Jul 25 13:56:35 2024 +0200

    fix: update .gitignore

commit c86bbcb
Author: Nicolas KEMPF <[email protected]>
Date:   Thu Jul 25 12:44:45 2024 +0200

    Add reports (#436)

    * feat: report modal

    * feat add confirm screen

    * feat: add report button to dataset

    * feat: add reports to reuse and organization page

    * feat: show loading state and error

    * feat: add loading and succeeded states

    * feat: add reports to dataservices

    * feat: force report message
@bolinocroustibat
fix: use master branch of udata
f6adff2
@bolinocroustibat bolinocroustibat merged commit 1c19d93 into master Jul 30, 2024
10 of 14 checks passed
@bolinocroustibat bolinocroustibat deleted the remove-sentry branch July 30, 2024 15:15
magopian added a commit to opendatateam/udata that referenced this pull request Jul 31, 2024
@magopian
Use requests==2.32.3 everywhere for consistency
4a716a1 
This fixes the "urllib3 is the wrong version down the line" issue when
isntalling the project from scratch.
This goes hand in hand with the commit on udata-front:
datagouv/udata-front#455
@magopian magopian mentioned this pull request Jul 31, 2024
Merged
magopian added a commit to opendatateam/udata that referenced this pull request Jul 31, 2024
@magopian
Use requests==2.32.3 everywhere for consistency (#3116)
8ab264e 
This fixes the "urllib3 is the wrong version down the line" issue when
installing the project from scratch.
This goes hand in hand with the commit on udata-front:
datagouv/udata-front#455
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maudetes maudetes maudetes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bolinocroustibat @maudetes