From cd6366fc8dc99cc980df66ef349748ec27cd96f0 Mon Sep 17 00:00:00 2001 From: Eytan Adler <63426601+eytanadler@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:04:28 -0400 Subject: [PATCH] Changed master branch name to main in all files (#39) --- .github/workflows/openconcept.yaml | 2 +- docs/features/openmdao/openmdao_basics.rst | 2 +- readme.md | 4 ++-- setup.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openconcept.yaml b/.github/workflows/openconcept.yaml index f0e951dc..2fe406ac 100644 --- a/.github/workflows/openconcept.yaml +++ b/.github/workflows/openconcept.yaml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: build: diff --git a/docs/features/openmdao/openmdao_basics.rst b/docs/features/openmdao/openmdao_basics.rst index 0a0eefb2..a281872b 100644 --- a/docs/features/openmdao/openmdao_basics.rst +++ b/docs/features/openmdao/openmdao_basics.rst @@ -100,7 +100,7 @@ While the utility has many uses (see the OpenMDAO docs), every user should make Putting it all Together ----------------------- -The ``examples/TBM850.py`` `script `_ models a single-engine turboprop aircraft and uses all of the elements mentioned on this page in an OpenConcept context. +The ``examples/TBM850.py`` `script `_ models a single-engine turboprop aircraft and uses all of the elements mentioned on this page in an OpenConcept context. diff --git a/readme.md b/readme.md index e0622205..6deb40aa 100644 --- a/readme.md +++ b/readme.md @@ -2,8 +2,8 @@ ### Author: Benjamin J. Brelje and Eytan J. Adler -[![Build](https://github.com/mdolab/openconcept/workflows/Build/badge.svg?branch=master)](https://github.com/mdolab/openconcept/actions?query=branch%3Amaster) -[![Coverage](https://codecov.io/gh/mdolab/openconcept/branch/master/graph/badge.svg?token=RR8CN3IOSL)](https://codecov.io/gh/mdolab/openconcept) +[![Build](https://github.com/mdolab/openconcept/workflows/Build/badge.svg?branch=main)](https://github.com/mdolab/openconcept/actions?query=branch%3Amain) +[![Coverage](https://codecov.io/gh/mdolab/openconcept/branch/main/graph/badge.svg?token=RR8CN3IOSL)](https://codecov.io/gh/mdolab/openconcept) [![Documentation](https://readthedocs.com/projects/mdolab-openconcept/badge/?version=latest)](https://mdolab-openconcept.readthedocs-hosted.com/en/latest/?badge=latest) OpenConcept is a new toolkit for the conceptual design of aircraft. OpenConcept was developed in order to model and optimize aircraft with electric propulsion at low computational cost. The tools are built on top of NASA Glenn's [OpenMDAO](http://openmdao.org/) framework, which in turn is written in Python. diff --git a/setup.py b/setup.py index a9902903..e3fb8aad 100644 --- a/setup.py +++ b/setup.py @@ -55,9 +55,9 @@ ], extras_require = { 'testing': ["pytest", "pytest-cov", "coverage", - "openaerostruct @ git+https://github.com/mdolab/OpenAeroStruct.git@master"], + "openaerostruct @ git+https://github.com/mdolab/OpenAeroStruct.git@main"], 'docs': ["sphinx_mdolab_theme", - "openaerostruct @ git+https://github.com/mdolab/OpenAeroStruct.git@master"], + "openaerostruct @ git+https://github.com/mdolab/OpenAeroStruct.git@main"], 'plot': ["matplotlib"] }, )