Skip to content

[Proposal] Track Submodule pymc-examples Git Fix #4375

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

Merged

Conversation

CloudChaoszero
Copy link
Contributor

Overview

Proposed 🤞 fix to track submodule pymc-examples to the main branch.

  • Configure .gitmodules to specify branch for submodule

(potentially) closes #4357

However, there are some notes... ⬇️

Notes

  • I was not able to locally update (from the command below) due to permission issues.
    git submodule update --remote

You can see this error to align commit to main branch here
Screen Shot 2020-12-23 at 2 36 38 AM

* Configure .gitmodules to specify branch for submodule
* closes pymc-devs#4357
@codecov
Copy link

codecov bot commented Dec 23, 2020

Codecov Report

Merging #4375 (1439ba7) into master (0402aab) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4375   +/-   ##
=======================================
  Coverage   87.95%   87.96%           
=======================================
  Files          88       88           
  Lines       14493    14501    +8     
=======================================
+ Hits        12748    12756    +8     
  Misses       1745     1745           
Impacted Files Coverage Δ
pymc3/model.py 89.29% <0.00%> (+0.01%) ⬆️
pymc3/distributions/dist_math.py 92.17% <0.00%> (+0.20%) ⬆️

.gitmodules Outdated
@@ -1,3 +1,4 @@
[submodule "docs/source/pymc-examples"]
path = docs/source/pymc-examples
url = [email protected]:pymc-devs/pymc-examples.git
Copy link
Contributor

Choose a reason for hiding this comment

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

I presume this doesn't work for you because you don't have ssh keys set up. Perhaps we can change this line to

Suggested change
url = git@github.com:pymc-devs/pymc-examples.git
url = https://github.com/pymc-devs/pymc-examples.git

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, I see @MarcoGorelli. Thanks!

Did that. Following, I did a git submodule sync, based on this article.


Process now looked like:
0. Edit the .gitmodules file

  1. git submodule sync
  2. git submodule update --remote
  3. git checkout main (on the submodule)
  4. Went to parent module, and committed changes

* Configure .gitmodules to specify branch for submodule
* closes pymc-devs#4357
* Updated .gitattributes file
* git submodule sync
* switch branch
* go to parent module, and commit
@CloudChaoszero
Copy link
Contributor Author

CloudChaoszero commented Dec 24, 2020

Update made, well I hope.

Before going into recommended updates from the original suggested article, here, I did the following:


Process now looked like:

  1. Edit the .gitmodules file
  2. git submodule sync, based on this article.
  3. git submodule update --remote
  4. git checkout main (on the submodule)
  5. Went to parent module, and committed changes

Oddly, the submodule is pointed to a commit SHA, and not main. (I think that's expected?)

That being said, going forward, updating that submodule maaaaaay look like git submodule update --remote command only.

Copy link
Contributor

@MarcoGorelli MarcoGorelli left a comment

Choose a reason for hiding this comment

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

Thanks, this looks right

Can you just update build_and_deploy_docs.sh as well?

@CloudChaoszero
Copy link
Contributor Author

Thanks, this looks right

Can you just update build_and_deploy_docs.sh as well?

Sounds great! Changed the git submodule line, line 6, to the one that i used.

Copy link
Contributor

@MarcoGorelli MarcoGorelli left a comment

Choose a reason for hiding this comment

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

@twiecki twiecki merged commit 93b68f2 into pymc-devs:master Dec 25, 2020
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.

pymc-examples submodule should track main branch
3 participants