diff --git a/docs/Doxyfile b/docs/Doxyfile index a486e26833..f122e68959 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = proteus # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.7.5.dev0 +PROJECT_NUMBER = 1.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. diff --git a/proteus/__init__.py b/proteus/__init__.py index 5ae637a7ed..2483772aff 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -9,7 +9,7 @@ import pkgutil __path__ = pkgutil.extend_path(__path__, __name__) -__version__ = '1.7.5dev' +__version__ = '1.8.0' __all__ = ["Archiver", "Domain", diff --git a/scripts/deploy.sh b/scripts/deploy.sh index d484542bd5..1171798e7b 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -7,7 +7,7 @@ if [ "$1" == "docs" ]; then fi git config --global user.email "travis@travis-ci.org" git config --global user.name "Travis CI" - git clone --branch master https://${GH_TOKEN}@github.com/erdc/proteus-docs.git ./docs/build > /dev/null 2>&1 + git clone --branch main https://${GH_TOKEN}@github.com/erdc/proteus-docs.git ./docs/build > /dev/null 2>&1 # check that docs folder exists if [[ -d ./docs/build ]] then @@ -19,7 +19,7 @@ if [ "$1" == "docs" ]; then then git add . * git commit -m "Travis automatic docs build: $TRAVIS_BUILD_NUMBER" - git push origin master > /dev/null 2>&1 + git push origin main > /dev/null 2>&1 else echo "Error: wrong repository for docs; aborting" exit 1 diff --git a/setup.py b/setup.py index 8470845bd0..24907e84b7 100644 --- a/setup.py +++ b/setup.py @@ -760,7 +760,7 @@ def __str__(self): def setup_given_extensions(extensions): setup(name='proteus', - version='1.7.5dev', + version='1.8.0', classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: Console',