Update dsra psra oct2021 (opendrr-api) #154
Conversation
wkhchow
commented
Jan 18, 2022
wkhchow
commented
- PR along with model-factory Update dsra psra oct2021 (model-factory) model-factory#96
- updates to support updated DSRA/PSRA requirements
- bug fixes
- update latest docker/ES version
- current PT_LIST in add_data.sh is missing BC, need to add back once BC is ready
- current canada-srm2 is running off a branch and not master, and may need to remove reference if branch is merged to master
- change PT_LIST to provinces that are ready - change srm2 repo to test repo (tieg_natmodel2021) - run model factory branch - psra r2 to r1
wkhchow
changed the title
jvanulde
added
Bug
docker-compose-run.yml
Outdated
| @@ -6,7 +6,7 @@ volumes: | |||
| services: | |||
|
|
|||
| kibana-opendrr: | |||
| image: kibana:7.12.0 | |||
| image: docker.elastic.co/kibana/kibana:7.16.1 | |||
| @@ -385,7 +424,7 @@ read_github_token() { | |||
| # from the OpenDRR/model-factory repository | |||
| get_model_factory_scripts() { | |||
| # TODO: Make this more robust | |||
| RUN git clone https://github.com/OpenDRR/model-factory.git --depth 1 || (cd model-factory ; RUN git pull) | |||
| RUN git clone https://github.com/OpenDRR/model-factory.git --branch update_dsra_psra_oct2021 --depth 1 || (cd model-factory ; RUN git pull) | |||
There was a problem hiding this comment.
Can we move the dependencies to release assets to avoid a clone?
There was a problem hiding this comment.
Can we move the dependencies to release assets to avoid a clone?
@jvanulde Intriguing idea! (I've never thought of this before, at least not for model-factory, as I was only thinking of a way out of Git LFS and model-factory doesn't use any and escaped my mind)
But yeah! This would be one way to ensure the versions are consistent between model-factory and opendrr-api for releases, and we do get the "Source code (tar.gz)" release assets for free, automatically generated by GitHub whenever version is tagged and/or released, e.g. https://github.com/OpenDRR/model-factory/archive/refs/tags/v1.2.0.tar.gz
For development (and testing), I guess we could keep the alternative of using git clone to fetch from master or topic branch like update_dsra_psra_oct2021, though apparently we could just fetch these as tarballs too unless we need the git history:
- https://github.com/OpenDRR/model-factory/archive/refs/heads/master.tar.gz
- https://github.com/OpenDRR/model-factory/archive/refs/heads/update_dsra_psra_oct2021.tar.gz
Let's continue the discussion in a new issue! I have just copied the above to:
There was a problem hiding this comment.
Agree, we should pull from a release. This branch of model-factory has been merged so we are free to revert back to pulling from master
This is similar to the reverted commit 4548803 except unrelated changes that fix Flake8 warnings are no longer included, to be dealt with in a future pull request.
There was a problem hiding this comment.
Great work! Looks good to me! :-)
There is a merge conflict because we were making changes to docker-compose.yml and
python/dsra_postgres2es.py in both master and update_dsra_psra_oct2021 branches. I did an interactive rebase locally (git rebase -i master etc.) and fixed the merge conflict esp. in python/dsra_postgres2es.py by reverting commit 4548803 (that changed more than what the commit log said, my bad) in commit 1e33297, and re-applying it in commit 1e33297.
Since GitHub won't let us merge the original update_dsra_psra_oct2021 branch any other way, I'll proceed to force-push the rebased branch while backing up the original branch as update_dsra_psra_oct2021_ORIGINAL.
anthonyfok
force-pushed
the
update_dsra_psra_oct2021
branch
from
7588ee2 to
1e33297
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Lintly has detected code quality issues in this pull request.
Many of these were previously fixed in commit 4548803 but was reverted during conflict resolution.
