Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #634 Update production URL references to tools.in-core.org and dev to dev.in-core.org #635

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixes #634 Update production URL references to tools.in-core.org and dev to dev.in-core.org #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f753911
Fixes #634 Update production URL references to tools.in-core.org and …
navarroc Nov 22, 2024
9508272
Merge branch 'develop' into 634-replace-production-and-dev-static-urls
navarroc Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- CoreCGEML bug and updated base values [#627](https://github.com/IN-CORE/pyincore/issues/627)

### Changed
- Update production URL references to tools.in-core.org and dev to dev.in-core.org [#634](https://github.com/IN-CORE/pyincore/issues/634)


## [1.20.0] - 2024-10-24

Expand Down
8 changes: 4 additions & 4 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ To update **pyIncore**, run
conda update -c in-core pyincore

You can find detail information at the
`Installation <https://incore.ncsa.illinois.edu/doc/incore/pyincore/install_pyincore.html>`__
`Installation <https://tools.in-core.org/doc/incore/pyincore/install_pyincore.html>`__
section at IN-CORE manual.

Installation with pip
Expand Down Expand Up @@ -61,17 +61,17 @@ Testing and Running
-------------------

Please read the `Testing and
Running <https://incore.ncsa.illinois.edu/doc/incore/pyincore/running.html>`__
Running <https://tools.in-core.org/doc/incore/pyincore/running.html>`__
section at IN-CORE manual.

Documentation
-------------

**pyIncore** documentation can be found at
https://incore.ncsa.illinois.edu/doc/incore/pyincore.html
https://tools.in-core.org/doc/incore/pyincore.html

**pyIncore** technical reference (API) can be found at
https://incore.ncsa.illinois.edu/doc/pyincore/.
https://tools.in-core.org/doc/pyincore/.

Acknowledgement
---------------
Expand Down
8 changes: 4 additions & 4 deletions docs/source/refs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ References

<embed>
<ul>
<li><a href="https://incore.ncsa.illinois.edu/doc/incore/" target="_blank">IN-CORE</a> Manual</li>
<li><a href="https://incore.ncsa.illinois.edu/doc/pyincore_viz/" target="_blank">pyIncore-viz</a> Reference</li>
<li><a href="https://incore.ncsa.illinois.edu/doc/pyincore_data/" target="_blank">pyIncore-data</a> Reference</li>
<li><a href="https://incore.ncsa.illinois.edu/doc/api/" target="_blank">IN-CORE Web Services API</a> specifications</li>
<li><a href="https://tools.in-core.org/doc/incore/" target="_blank">IN-CORE</a> Manual</li>
<li><a href="https://tools.in-core.org/doc/pyincore_viz/" target="_blank">pyIncore-viz</a> Reference</li>
<li><a href="https://tools.in-core.org/doc/pyincore_data/" target="_blank">pyIncore-data</a> Reference</li>
<li><a href="https://tools.in-core.org/doc/api/" target="_blank">IN-CORE Web Services API</a> specifications</li>
</ul>
</embed>
4 changes: 2 additions & 2 deletions pyincore/globals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

PACKAGE_VERSION = "1.20.1"

INCORE_API_PROD_URL = "https://incore.ncsa.illinois.edu"
INCORE_API_DEV_URL = "https://incore-dev.ncsa.illinois.edu"
INCORE_API_PROD_URL = "https://tools.in-core.org"
INCORE_API_DEV_URL = "https://dev.in-core.org"

INCORE_INTERNAL_API_URL = "http://localhost:8080"

Expand Down
4 changes: 2 additions & 2 deletions recipes/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ source:
path: ..

about:
home: https://incore.ncsa.illinois.edu
home: https://tools.in-core.org
license: MPL-2.0
summary: 'Python library for IN-CORE (Interdependent Networked Community Resilience Modeling Environment)'
description: 'pyIncore is a component of IN-CORE. It is a python package consisting of two primary components:
1) a set of service classes to interact with the IN-CORE web services, and 2) IN-CORE analyses. The pyIncore
package allows users to apply various hazards to infrastructure in selected areas, propagating the effect of
physical infrastructure damage and loss of functionality to social and economic impacts.'
dev_url: https://github.com/IN-CORE/pyincore
doc_url: https://incore.ncsa.illinois.edu/doc/incore
doc_url: https://tools.in-core.org/doc/incore

build:
# If this is a new build for the same version, increment the build
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
description="IN-CORE analysis tool python package",
long_description=readme,
long_description_content_type="text/x-rst",
url="https://incore.ncsa.illinois.edu",
url="https://tools.in-core.org",
license="Mozilla Public License v2.0",
classifiers=[
"Development Status :: 4 - Beta",
Expand Down
Loading