Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
Develop

See merge request incore/pyincore!79
  • Loading branch information
navarroc committed Apr 26, 2019
2 parents e7be999 + 1fea839 commit 754edb0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pyincore/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# and is available at https://www.mozilla.org/en-US/MPL/2.0/
import os

PACKAGE_VERSION = "0.2.0"
PACKAGE_VERSION = "0.3.0"

INCORE_API_PROD_URL = "https://incore2-services.ncsa.illinois.edu"
INCORE_API_INSECURE_URL = "http://incore2-services.ncsa.illinois.edu:8888"
Expand Down
2 changes: 1 addition & 1 deletion scripts/release-packages.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# List of pyincore analyses to either include or exclude for release
# If provided, 'excludes' takes preference over 'includeOnly'

version: '0.2.0'
version: '0.3.0'

includeOnly:
- buildingdamage
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='pyincore',
version='0.2.0',
version='0.3.0',
packages=find_packages(where=".", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),

description='IN-CORE analysis tool python package',
Expand Down

0 comments on commit 754edb0

Please sign in to comment.