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

v1.1.3 #9

Merged
merged 84 commits into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
12e2d70
Merge branch 'develop' into feature/taxonomia-update
daniprec May 11, 2021
11ae37e
Update taxonomia path
daniprec May 11, 2021
6db5554
Update score_item, remove unused items
daniprec May 11, 2021
eda6116
Raise KeyError when column name is missing in taxonomia
daniprec May 11, 2021
a1a0446
Merge branch 'develop' into feature/taxonomia-update
daniprec May 12, 2021
0250c98
Finish v1.1.2
daniprec May 12, 2021
87234a0
Update score items: COM_cent, CUL_tor, CUL_zoo
daniprec May 18, 2021
4d73e58
Add comment about date parsing
daniprec May 18, 2021
5200a70
preprocess format_hora can take ranges
daniprec May 18, 2021
031ee84
Remove option to choose date_format in format_hora
daniprec May 18, 2021
c91950c
Update .gitignore
daniprec May 18, 2021
4d38921
Update .gitignore
daniprec May 18, 2021
cd5bf3c
format_hora fix AttributeError
daniprec May 21, 2021
c9c9e43
Script warns when "provincia" column is empty
daniprec May 24, 2021
daded93
Merge pull request #3 from UCA-Datalab/feature/taxonomia-update
daniprec May 27, 2021
3f68a74
Initialize rho computation script
daniprec May 27, 2021
737a34f
Add logging info in casos and mobility scripts
daniprec May 27, 2021
cb42887
Update path to config in mobility
daniprec May 27, 2021
d59d33f
Rename functions and optimize compute_incidence_normed
daniprec May 27, 2021
a56bfd5
Rename functions in mobility
daniprec May 27, 2021
991ef4a
Replace sum operations with average
daniprec May 27, 2021
ba819ab
Rename some inner variables
daniprec May 27, 2021
8675141
Compute rho
daniprec May 27, 2021
c539d15
Docstring
daniprec May 27, 2021
eea19e3
Add provinces code to config
daniprec May 27, 2021
6ac564d
Reassing province codes to avoid duplicates
daniprec May 27, 2021
a88f99b
Code reassignation
daniprec May 27, 2021
09793ed
Add more codes to reassign
daniprec May 27, 2021
e48fcc1
Ensure dataframe index is named "date"
daniprec May 27, 2021
c9aaba2
Improve config error messages
daniprec May 28, 2021
1062112
Add missing import in mongo module
daniprec Jun 1, 2021
7763c7e
Update combine script: remove some ambitos
daniprec Jun 1, 2021
12c77cb
Store dict of conditions
daniprec Jun 3, 2021
f0ecb2f
Store processed taxonomia
daniprec Jun 3, 2021
5286fac
Sort taxonomia codes
daniprec Jun 3, 2021
61067b5
Improve condicion_personas
daniprec Jun 3, 2021
b24dddb
Change += to append
daniprec Jun 3, 2021
2a400ff
Fix hora preprocessing
daniprec Jun 3, 2021
afc3016
Set maximum ambito values to 1
daniprec Jun 3, 2021
d3e957d
Update RIN_afo
daniprec Jun 3, 2021
1a6e90f
Update score ceremonias
daniprec Jun 8, 2021
cb75101
Update score ceremonias (fix error)
daniprec Jun 8, 2021
19292ad
Data of abreviations and population
daniprec Jun 11, 2021
6710ff7
Script to run preprocessing and update web
daniprec Jun 11, 2021
7ee3e68
Include notebooks in gitignore
daniprec Jun 11, 2021
1ed0703
Move datos to data
daniprec Jun 11, 2021
6151f42
Rename guipuzkoa to guipuzcoa
daniprec Jun 11, 2021
9d008ff
Sort taxonomia by ambito and item
daniprec Jun 11, 2021
ad80782
Ignore nivel educacion in medidas
daniprec Jun 11, 2021
7312814
Fix max computation in score items
daniprec Jun 11, 2021
ab8f43e
Merge pull request #7 from UCA-Datalab/feature/dist_social
daniprec Jun 11, 2021
4e058e9
Ignore vscode folder
daniprec Jun 14, 2021
d6d89df
Update Dist Social item scoring
daniprec Jun 17, 2021
ff247bb
score_medidas is more complete
daniprec Jun 17, 2021
07ad938
Avoid porcentaje below 0
daniprec Jun 17, 2021
18a3176
Initialize test scripts
daniprec Jun 17, 2021
bcb850d
Update test function
daniprec Jun 17, 2021
5eb8597
Test do not store additional files
daniprec Jun 17, 2021
b87ec17
Integrate pytest in Github
daniprec Jun 17, 2021
be15ff4
Update pytest integration
daniprec Jun 17, 2021
70cbb4d
runs on to ubuntu-latest
daniprec Jun 17, 2021
0d94ba7
Add pytest to setup
daniprec Jun 17, 2021
fcf9b84
Simplify pytest integration
daniprec Jun 17, 2021
2a2c82e
Storing dictionary of conditions is optional
daniprec Jun 17, 2021
0da28ea
Use param path_out_condition
daniprec Jun 17, 2021
9a5e7d7
Remove files before storing new ones
daniprec Jun 17, 2021
b876fe0
Raise error when province is missing
daniprec Jun 17, 2021
2aa8626
Fix path in update script
daniprec Jun 17, 2021
5d313bc
Raise warning when percentage over 100 is found
daniprec Jun 17, 2021
5edd640
pd.sum() do not replaces NaN values
daniprec Jun 18, 2021
e49bbd6
Move regions dict to script
daniprec Jun 19, 2021
26176d7
Add DICT_FILL_PROVINCIA to regions script
daniprec Jun 19, 2021
a10984b
Store isles as whole unit
daniprec Jun 19, 2021
8ddc92d
Function names
daniprec Jun 19, 2021
cdd0311
Split islas canarias
daniprec Jun 20, 2021
e1bf46b
Docstring
daniprec Jun 20, 2021
6e2d340
Organize imports
daniprec Jun 20, 2021
387a7c2
Optimize imports
daniprec Jun 20, 2021
8779cb1
Improve debug msg in datastore
daniprec Jun 20, 2021
da17555
Update dictionaries
daniprec Jun 21, 2021
ee50a2d
Assert percentages sum 1
daniprec Jun 21, 2021
1822b47
Keep isles apart from provinces
daniprec Jun 21, 2021
3edd742
Rename Tenerife as Santa Cruz de Tenerife
daniprec Jun 23, 2021
96a5914
Improve test score medidas
daniprec Jun 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: pytest

on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .[dev]
- name: Test with pytest
run: |
pytest
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ dmypy.json
*.iml

# Other directories
notebooks/*
output/*
.idea/*
datos_*
datos_*
/config*.toml
/log.out
/config-prod.toml
/.vscode
234 changes: 0 additions & 234 deletions config.toml

This file was deleted.

Loading