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

📊 conflict: ucdp update #3201

Merged
merged 32 commits into from
Aug 29, 2024
Merged

📊 conflict: ucdp update #3201

merged 32 commits into from
Aug 29, 2024

Conversation

lucasrodes
Copy link
Member

@lucasrodes lucasrodes commented Aug 26, 2024

[tracking issue]

View diff without step copy

Tasks

  • utils to extend time-series
  • Gleditsch: new dataset, update charts
  • UCDP
  • UCDP/PRIO

@owidbot
Copy link
Contributor

owidbot commented Aug 26, 2024

Quick links (staging server):

Site Admin Wizard

Login: ssh owid@staging-site-update-ucdp-2

chart-diff: ✅
  • 37/37 reviewed charts
    • Modified: 37/37
    • New: 0/0
data-diff: ❌ Found differences
~ Dataset garden/countries/2024-08-27/gleditsch (new version)
-   - short_name: gleditsch_no_population
    ?                      --------------
+   + short_name: gleditsch
-   - version: '2024-01-08'
    ?                 ^ ^^
+   + version: '2024-08-27'
    ?                 ^ ^^
+ + Table gleditsch_regions
+   + Column number_countries
+   + Column population
  = Table gleditsch_countries
    ~ Dim id
+       + New values: 197 / 20418 (0.96%)
           year  id
           2023  57
           2023 370
           2023 501
           2023 692
           2023 830
    ~ Dim year
+       + New values: 197 / 20418 (0.96%)
           id  year
           57  2023
          370  2023
          501  2023
          692  2023
          830  2023
    ~ Column country (new data)
+       + New values: 197 / 20418 (0.96%)
           id  year                          country
           57  2023 Saint Vincent and the Grenadines
          370  2023                          Belarus
          501  2023                            Kenya
          692  2023                          Bahrain
          830  2023                        Singapore
  = Table gleditsch
+ Dataset garden/war/2024-08-26/ucdp
+ + Table ucdp
+   + Column number_deaths_ongoing_conflicts
+   + Column number_deaths_ongoing_conflicts_high
+   + Column number_deaths_ongoing_conflicts_low
+   + Column number_ongoing_conflicts
+   + Column number_new_conflicts
+   + Column number_ongoing_conflicts_per_country
+   + Column number_ongoing_conflicts_per_country_pair
+   + Column number_new_conflicts_per_country
+   + Column number_new_conflicts_per_country_pair
+   + Column number_deaths_ongoing_conflicts_per_capita
+   + Column number_deaths_ongoing_conflicts_high_per_capita
+   + Column number_deaths_ongoing_conflicts_low_per_capita
+ + Table ucdp_country
+   + Column participated_in_conflict
+   + Column number_participants
+ + Table ucdp_locations
+   + Column is_location_of_conflict
+   + Column number_deaths
+   + Column number_deaths_low
+   + Column number_deaths_high
+   + Column death_rate
+   + Column death_rate_low
+   + Column death_rate_high
+   + Column number_locations
+ Dataset garden/war/2024-08-26/ucdp_prio
+ + Table ucdp_prio
+   + Column number_deaths_ongoing_conflicts
+   + Column number_deaths_ongoing_conflicts_high
+   + Column number_deaths_ongoing_conflicts_low
+   + Column number_deaths_ongoing_conflicts_per_capita
+   + Column number_deaths_ongoing_conflicts_high_per_capita
+   + Column number_deaths_ongoing_conflicts_low_per_capita


Legend: +New  ~Modified  -Removed  =Identical  Details
Hint: Run this locally with etl diff REMOTE data/ --include yourdataset --verbose --snippet

Automatically updated datasets matching weekly_wildfires|excess_mortality|covid|fluid|flunet|country_profile|garden/ihme_gbd/2019/gbd_risk are not included

Edited: 2024-08-29 18:13:29 UTC
Execution time: 24.86 seconds

@@ -116,7 +116,7 @@ def filter_to_subgraph(

if only:
# Only include explicitly selected nodes
return {step: graph.get(step, set()) & included for step in included}
return {step: graph.get(step, set()) & included for step in includes}
Copy link
Collaborator

Choose a reason for hiding this comment

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

This fix wasn't working, could you revert it to included, please?

@lucasrodes lucasrodes marked this pull request as ready for review August 29, 2024 17:33
@lucasrodes lucasrodes merged commit 2daeb74 into master Aug 29, 2024
8 checks passed
@lucasrodes lucasrodes deleted the update-ucdp-2 branch August 29, 2024 18:17
Marigold pushed a commit that referenced this pull request Aug 30, 2024
* 📊 conflict: ucdp update

* Copy steps

* revert

* snapshot

* fix short_name snapshot

* meadow

* wip

* wip

* wip

* wip

* wip

* test

* fix typing

* fix test

* comment for now

* add 'none' option, add docs

* garden

* grapher

* only set dtypes if no interpolation is used

* fix dag

* fix dtype if

* bugfix: use int for range

* update gleditsch dependency

* clean code

* remove import

* change dataset name

* change attribution year in metadata

* update ucdp_prio

* archive
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.

3 participants