Skip to content

Commit

Permalink
Merge pull request #587 from IN-CORE/main
Browse files Browse the repository at this point in the history
Main to dev
  • Loading branch information
longshuicy authored Jun 11, 2024
2 parents 88d3b15 + 63a3886 commit 4f91a29
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
## [1.19.0] - 2024-06-12

### Changed
- Rename Social Vulnerability Analysis to Social Vulnerability Index Analysis [#556](https://github.com/IN-CORE/pyincore/issues/556)
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
author = ''

# The short X.Y version
version = '1.18'
version = '1.19'
# The full version, including alpha/beta/rc tags
release = '1.18.1'
release = '1.19.0'

# -- General configuration ---------------------------------------------------

Expand Down Expand Up @@ -237,4 +237,4 @@
# -- Options for intersphinx extension ---------------------------------------

# Example configuration for inter sphinx: refer to the Python standard library.
# intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
# intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,10 @@ def get_spec(self):
"ergo:buildingDamageVer6",
"ergo:buildingInventory",
"ergo:nsBuildingInventoryDamage",
"ergo:nsBuildingInventoryDamageVer2"]
"ergo:nsBuildingInventoryDamageVer2",
'ergo:nsBuildingInventoryDamageVer3',
'ergo:nsBuildingInventoryDamageVer4'
]
},
{
"id": "building_functionality_level",
Expand Down
4 changes: 3 additions & 1 deletion pyincore/analyses/meandamage/meandamage.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,14 @@ def get_spec(self):
'ergo:nsBuildingInventoryDamage',
'ergo:nsBuildingInventoryDamageVer2',
'ergo:nsBuildingInventoryDamageVer3',
'ergo:nsBuildingInventoryDamageVer4',
'ergo:bridgeDamage',
'ergo:bridgeDamageVer2',
'ergo:bridgeDamageVer3',
'ergo:roadDamage',
'ergo:roadDamageVer2',
'ergo:roadDamageVer3']
'ergo:roadDamageVer3'
]
},
{
'id': 'dmg_ratios',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ def get_spec(self):
'ergo:nsBuildingInventoryDamage',
'ergo:nsBuildingInventoryDamageVer2',
'ergo:nsBuildingInventoryDamageVer3',
'ergo:nsBuildingInventoryDamageVer4',
'ergo:bridgeDamage',
'ergo:bridgeDamageVer2',
'ergo:bridgeDamageVer3',
Expand Down
2 changes: 1 addition & 1 deletion pyincore/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import os
import shutil

PACKAGE_VERSION = "1.18.1"
PACKAGE_VERSION = "1.19.0"

INCORE_API_PROD_URL = "https://incore.ncsa.illinois.edu"
INCORE_API_DEV_URL = "https://incore-dev.ncsa.illinois.edu"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from setuptools import setup, find_packages

# version number of pyincore
version = '1.18.1'
version = '1.19.0'

with open("README.rst", encoding="utf-8") as f:
readme = f.read()
Expand Down

0 comments on commit 4f91a29

Please sign in to comment.