Giter Club home page Giter Club logo

Comments (7)

bmorris3 avatar bmorris3 commented on August 17, 2024

Do you have any suggestions for resources on how to update .travis.yml? Should we use the recipe for installing missing dependencies with apt-get?

from astroplan.

cdeil avatar cdeil commented on August 17, 2024

@bmorris3 – I think the existing .travis.yml file in this repo or in the Astropy or other affiiliated package repos are the best resources. Add to the existing pip install or conda install lines or put new lines using conda install or pip install.

from astroplan.

bmorris3 avatar bmorris3 commented on August 17, 2024

I have a lame git question. (With lack of foresight) I made the commits with API updates on my master branch. To make a new branch with just the doc updates from this issue, I created a new branch, git reset back to last commit before I added the API, and added the new docs updates. I can't push these updates because the tip of the current branch is behind the remote.

Does this mean I need to git reset the master branch too? Will that ruin/auto-close my API PR?

from astroplan.

cdeil avatar cdeil commented on August 17, 2024

@bmorris3 – Hmmm ... usually my suggestion would be to start with new branches and pull requests. But in case of #4 it would be good to keep that branch and pull request going. And as far as I know it's not possible to change the base or feature branch for Github pull requests (see e.g. here).

So my suggestion would be that you:

  • make a tarball of your local repo directory before doing git reset or rebase commands, in case something goes wrong from which it's hard or impossible to recover.
  • keep the master branch in your local repo and on your github fork for the API spec. If you have extra commits on there, you can git reset --hard to get rid of them.
  • For the feature branch discussed here, make a new branch off of upstream master (i.e. not containing the commits from your local master branch) and then git cherry-pick the commits you already have to work on that (bmorris3@048d875) into that branch. Then make a pull request and check the commit and diff on Github.

Makes sense?

Of course this is only a suggestions, any other solution you come up with is OK.

Good luck!

from astroplan.

bmorris3 avatar bmorris3 commented on August 17, 2024

Thanks for the git tutoring, I'm actually really thankful to be dealing with these git problems with the shelter of git-proficient mentors so I can learn. How do you make a new branch off of the upstream master without overwriting the current master?

from astroplan.

cdeil avatar cdeil commented on August 17, 2024

This is not the git workflow I use, but this should work

git fetch upstream
git checkout -b my-feature upstream/master

By upstream I mean the core Astropy repo on github, depending on how you cloned the repo and set up your remotes it might be called origin. Use this to check:

git remote -v

from astroplan.

cdeil avatar cdeil commented on August 17, 2024

This has been implemented by @bmorris3 in #8.
We might need skyfield or pyephem on readthedocs in the future, but I guess we can add this when the need arises.

from astroplan.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.