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.

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

Update from 'EMMO-python' -> 'EMMOntoPy' #477

Merged
merged 3 commits into from
Oct 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/utils/release_tag_msg.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TAG_NAME

See the
[versioned online documentation](https://emmo-repo.github.io/EMMO-python/TAG_NAME)
[versioned online documentation](https://emmo-repo.github.io/EMMOntoPy/TAG_NAME)
for more information.
The full changelog can be seen
[here](https://emmo-repo.github.io/EMMO-python/TAG_NAME/CHANGELOG).
[here](https://emmo-repo.github.io/EMMOntoPy/TAG_NAME/CHANGELOG).
4 changes: 2 additions & 2 deletions .github/utils/single_dependency_pr_body.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### Update dependencies

Automatically created PR from [`ci/dependabot-updates`](https://github.com/emmo-repo/EMMO-python/tree/ci/dependabot-updates).
Automatically created PR from [`ci/dependabot-updates`](https://github.com/emmo-repo/EMMOntoPy/tree/ci/dependabot-updates).

For more information see the ["Dependabot updates" workflow](https://github.com/emmo-repo/EMMO-python/blob/master/.github/workflows/ci_dependabot.yml).
For more information see the ["Dependabot updates" workflow](https://github.com/emmo-repo/EMMOntoPy/blob/master/.github/workflows/ci_dependabot.yml).

#### To-do

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
update-and-publish:
name: Update CHANGELOG and documentation
if: github.repository == 'emmo-repo/EMMO-python'
if: github.repository == 'emmo-repo/EMMOntoPy'
runs-on: ubuntu-latest

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
with:
ref: master

- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.8"

- name: Install `pre-commit` and dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.8"

- name: Install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ RUN wget https://github.com/jgm/pandoc/releases/download/2.1.2/pandoc-2.1.2-1-am
RUN pip install --upgrade pip

RUN useradd -ms /bin/bash user
COPY . /home/user/EMMO-python
RUN cd /home/user/EMMO-python && pip install -e . && cd -
RUN chown user:user -R /home/user/EMMO-python/
COPY . /home/user/EMMOntoPy
RUN cd /home/user/EMMOntoPy && pip install -e . && cd -
RUN chown user:user -R /home/user/EMMOntoPy/
USER user
WORKDIR /home/user/
#ENTRYPOINT python
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<!-- markdownlint-disable MD033 -->

![CI tests](https://github.com/emmo-repo/EMMO-python/workflows/CI%20Tests/badge.svg)
![CI tests](https://github.com/emmo-repo/EMMOntoPy/workflows/CI%20Tests/badge.svg)
[![PyPI version](https://badge.fury.io/py/EMMOntoPy.svg)](https://badge.fury.io/py/EMMOntoPy)

> ***Note**: EMMOntoPy is a continuation of the EMMO-python project and the associated `emmo` Python package.
Expand Down Expand Up @@ -75,7 +75,7 @@ Some examples of what you can do with EMMOntoPy includes:
## Documentation and examples

The [Owlready2 documentation][Owlready2-doc] is a good starting point.
The EMMOntoPy package also has its own [dedicated documentation](https://emmo-repo.github.io/EMMO-python).
The EMMOntoPy package also has its own [dedicated documentation](https://emmo-repo.github.io/EMMOntoPy).

This includes a few examples and demos:

Expand Down Expand Up @@ -160,7 +160,7 @@ It has mainly been developed by [SINTEF](https://www.sintef.no/), specifically:
Grant Agreement No: 953167
<img src="https://openmodel.ifam.fraunhofer.de/app/uploads/sites/2/2021/07/open-model-logo.png" width="90">

[EMMOntoPy]: https://github.com/emmo-repo/EMMO-python/
[EMMOntoPy]: https://github.com/emmo-repo/EMMOntoPy/
[Owlready2]: https://pypi.org/project/Owlready2/
[Owlready2-doc]: https://owlready2.readthedocs.io/
[EMMO]: https://emmo-repo.github.io
Expand Down
6 changes: 3 additions & 3 deletions docs/developers/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ To install the package, please do **not** install from PyPI.
Instead you should clone the repository from GitHub:

```console
$ git clone https://github.com/emmo-repo/EMMO-python.git
$ git clone https://github.com/emmo-repo/EMMOntoPy.git
```

or, if you are using an SSH connection to GitHub, you can instead clone via:

```console
$ git clone git@github.com:emmo-repo/EMMO-python.git
$ git clone git@github.com:emmo-repo/EMMOntoPy.git
```

Then enter into the newly cloned `EMMO-python` directory (`cd EMMO-python`) and run:
Then enter into the newly cloned `EMMOntoPy` directory (`cd EMMOntoPy`) and run:

```console
$ pip install -U -e .[dev]
Expand Down
10 changes: 5 additions & 5 deletions docs/docker-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
## Clone project

```bash
git clone git@github.com:emmo-repo/EMMO-python.git
git clone git@github.com:emmo-repo/EMMOntoPy.git
```

## Build Docker image

```bash
cd EMMO-python
cd EMMOntoPy
docker build -t emmo .
```

Expand Down Expand Up @@ -41,19 +41,19 @@ docker build -t emmomount -f mount.Dockerfile .
In a unix terminal (Linux)

```bash
docker run --rm -it -v $(pwd):/home/user/EMMO-python emmomount
docker run --rm -it -v $(pwd):/home/user/EMMOntoPy emmomount
```

In PowerShell (Windows 10):

```PowerShell
docker run --rm -it -v ${PWD}:/home/user/EMMO-python emmomount
docker run --rm -it -v ${PWD}:/home/user/EMMOntoPy emmomount
```

To install EMMOntoPy package inside container:

```bash
cd EMMO-python
cd EMMOntoPy
pip install .
```

Expand Down
6 changes: 3 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<!-- markdownlint-disable MD033 -->

![CI tests](https://github.com/emmo-repo/EMMO-python/workflows/CI%20Tests/badge.svg)
![CI tests](https://github.com/emmo-repo/EMMOntoPy/workflows/CI%20Tests/badge.svg)
[![PyPI version](https://badge.fury.io/py/EMMOntoPy.svg)](https://badge.fury.io/py/EMMOntoPy)

> ***Note**: EMMOntoPy is a continuation of the EMMO-python project and the associated `emmo` Python package.
Expand Down Expand Up @@ -75,7 +75,7 @@ Some examples of what you can do with EMMOntoPy includes:
## Documentation and examples

The [Owlready2 documentation][Owlready2-doc] is a good starting point.
The EMMOntoPy package also has its own [dedicated documentation](https://emmo-repo.github.io/EMMO-python).
The EMMOntoPy package also has its own [dedicated documentation](https://emmo-repo.github.io/EMMOntoPy).

This includes a few examples and demos:

Expand Down Expand Up @@ -160,7 +160,7 @@ It has mainly been developed by [SINTEF](https://www.sintef.no/), specifically:
Grant Agreement No: 953167
<img src="https://openmodel.ifam.fraunhofer.de/app/uploads/sites/2/2021/07/open-model-logo.png" width="90">

[EMMOntoPy]: https://github.com/emmo-repo/EMMO-python/
[EMMOntoPy]: https://github.com/emmo-repo/EMMOntoPy/
[Owlready2]: https://pypi.org/project/Owlready2/
[Owlready2-doc]: https://owlready2.readthedocs.io/
[EMMO]: https://emmo-repo.github.io
Expand Down
2 changes: 1 addition & 1 deletion docs/tools-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ ontoconvert --recursive emmo.ttl owl/emmo.owl
ontoconvert --inferred emmo.ttl emmo-inferred.owl
```

Note, it is then required to add the argument `only_local=True` when loading the locally converted ontology in EMMO-python, e.g.:
Note, it is then required to add the argument `only_local=True` when loading the locally converted ontology in EMMOntoPy, e.g.:

```python
from ontopy import get_ontology
Expand Down
2 changes: 1 addition & 1 deletion examples/emmodoc/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ Possible annotations are:
[Manchester_OWL]: http://ceur-ws.org/Vol-216/submission_9.pdf
[Owlready2]: https://pythonhosted.org/Owlready2/
[Lamy2017]: http://www.lesfleursdunormal.fr/_downloads/article_owlready_aim_2017.pdf
[EMMOntoPy]: https://github.com/emmo-repo/EMMO-python
[EMMOntoPy]: https://github.com/emmo-repo/EMMOntoPy
[Great_table_of_DL]: http://www.lesfleursdunormal.fr/static/_downloads/great_ontology_table.pdf
[universal_restriction]: https://en.wikipedia.org/wiki/Universal_quantifier
[existential_restriction]: https://en.wikipedia.org/wiki/Universal_quantifier
Expand Down
2 changes: 1 addition & 1 deletion examples/jupyter-visualization/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ In a terminal, run:
cd /path/to/env/dirs
python -m venv cytopy # cytopy is my name, you can choose what ouy want
source cytopy/bin/activate
cd /dir/to/EMMO-python/
cd /dir/to/EMMOntoPy/
pip install -e .
pip install jupyterlab
python -m ipykernel install --user --name=cytopy
Expand Down
6 changes: 3 additions & 3 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
site_name: EMMOntoPy
site_description: Documentation for the EMMOntoPy library
site_url: https://emmo-repo.github.io/EMMO-python
site_url: https://emmo-repo.github.io/EMMOntoPy
copyright: Copyright &copy; 2019-2021 SINTEF

theme:
Expand All @@ -18,8 +18,8 @@ theme:
- navigation.instant
- navigation.top

repo_name: EMMO-python
repo_url: https://github.com/emmo-repo/EMMO-python
repo_name: EMMOntoPy
repo_url: https://github.com/emmo-repo/EMMOntoPy
edit_uri: ""

extra:
Expand Down
2 changes: 1 addition & 1 deletion ontopy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# pylint: disable=wrong-import-position,wrong-import-order
import sys

__version__ = "0.3.3"
__version__ = "0.3.1"

# Ensure correct Python version
if sys.version_info < (3, 6):
Expand Down
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def fglob(patt):

# Read long description from README.md file replacing references to local
# files to github urls
BASE_URL = "https://raw.githubusercontent.com/emmo-repo/EMMO-python/master/"
BASE_URL = "https://raw.githubusercontent.com/emmo-repo/EMMOntoPy/master/"
with open(os.path.join(rootdir, "README.md"), "rt") as handle:
long_description = re.sub(
r"(\[[^]]+\])\(([^:)]+)\)", rf"\1({BASE_URL}\2)", handle.read()
Expand Down Expand Up @@ -80,7 +80,7 @@ def fglob(patt):
),
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/emmo-repo/EMMO-python",
url="https://github.com/emmo-repo/EMMOntoPy",
license="BSD",
python_requires=">=3.6.0",
classifiers=[
Expand Down Expand Up @@ -117,18 +117,18 @@ def fglob(patt):
},
include_package_data=True,
data_files=[
("share/EMMO-python", ["README.md", "LICENSE.txt"]),
("share/EMMOntoPy", ["README.md", "LICENSE.txt"]),
(
"share/EMMO-python/examples/emmodoc",
"share/EMMOntoPy/examples/emmodoc",
glob("examples/emmodoc/*.md")
+ glob("examples/emmodoc/*.yaml")
+ glob("examples/emmodoc/pandoc-*"),
),
(
"share/EMMO-python/examples/emmodoc/figs",
"share/EMMOntoPy/examples/emmodoc/figs",
fglob("examples/emmodoc/figs/*"),
),
# ('share/EMMO-python/examples', rglob('examples/**')),
("share/EMMO-python/demo", rglob("demo/**")),
# ('share/EMMOntoPy/examples', rglob('examples/**')),
("share/EMMOntoPy/demo", rglob("demo/**")),
],
)
2 changes: 1 addition & 1 deletion tools/ontodoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def main(argv: list = None):
"The easiest way to generate nice-looking documentation using "
"pandoc is to copy the emmodoc example to the current directory "
"and adapt it. See "
"https://github.com/emmo-repo/EMMO-python/tree/master/examples/"
"https://github.com/emmo-repo/EMMOntoPy/tree/master/examples/"
"emmodoc for more info."
),
)
Expand Down