Skip to content

Update .gitignore, requirements, and enhance indicators model with ne…#65

Closed
Abhishekfm wants to merge 1 commit into
devfrom
feat/datasource-link
Closed

Update .gitignore, requirements, and enhance indicators model with ne…#65
Abhishekfm wants to merge 1 commit into
devfrom
feat/datasource-link

Conversation

@Abhishekfm
Copy link
Copy Markdown

@Abhishekfm Abhishekfm commented Apr 27, 2026

No description provided.

Comment thread layer/management/commands/import_data.py Outdated
@jpmckinney
Copy link
Copy Markdown
Collaborator

jpmckinney commented Apr 27, 2026

@Deepthi-Chand You'll see I extracted India-specific logic in #66 so that IDS-DRR can be redeployed by other jurisdictions. I would propose to move in that direction. In support of that, I'll make changes to that branch and to the new configuration files, that correspond to the changes here. I also plan to record a short video and share on Slack to demo how deployment-specific configuration changes can be made.

Edit: My corresponding changes (specific commits referenced below this comment): 4d57de5...bff2eb4 I also added this branch's Assam CSV to the backend.zip attached to that PR.

jpmckinney added a commit that referenced this pull request Apr 27, 2026
jpmckinney added a commit that referenced this pull request Apr 27, 2026
jpmckinney added a commit that referenced this pull request Apr 27, 2026
@jpmckinney jpmckinney force-pushed the feat/datasource-link branch from fa47940 to 7fa32cd Compare May 5, 2026 19:37
@jpmckinney
Copy link
Copy Markdown
Collaborator

jpmckinney commented May 5, 2026

To help reduce conflicts, I've squashed your commits. You can still find your original history at fa47940

Otherwise, this still conflicts with #66 if this is merged first, but I already made the corresponding changes per my above message, so the solution to the conflicts will be to just let the reusable branch win, e.g.

git merge -X reusable feat/datasource-link

Or one file at a time:

git checkout --ours path/to/file
git add path/to/file

You can preview the conflicts with (from the reusable branch):

git merge --no-commit --no-ff feat/datasource-link

(Then git merge --abort after reviewing.)

Conflicts are essentially:

  • Indicator CSV updated in this branch, but removed in reusable (file moved to https://github.com/open-contracting/ids-drr-india-plugin)
  • import_data.py updated here, but this logic was refactored into layer/importers/indicators.py‎ in reusable
  • help_text in models.py differs (reusable uses more generic language)
    • This conflict could be resolved ahead of time if you want. Just need to copy the change into this branch, amend the commit, then force-push.
  • requirements.txt differs (reusable upgrades a few adjacent packages)

@Abhishekfm Abhishekfm closed this May 15, 2026
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.

2 participants