Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnatovFedor committed Nov 7, 2022
2 parents b3a0341 + 27ad09e commit ef1253c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 20 deletions.
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![License Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/deepmipt/DeepPavlov/blob/master/LICENSE)
[![License Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
![Python 3.6, 3.7, 3.8, 3.9](https://img.shields.io/badge/python-3.6%20%7C%203.7%20%7C%203.8%20%7C%203.9-green.svg)
[![Downloads](https://pepy.tech/badge/deeppavlov)](https://pepy.tech/project/deeppavlov)
<img align="right" height="27%" width="27%" src="docs/_static/deeppavlov_logo.png"/>
Expand All @@ -15,10 +15,10 @@ DeepPavlov is designed for
* Documentation [*docs.deeppavlov.ai*](http://docs.deeppavlov.ai/)
* Model List [*docs:features/*](http://docs.deeppavlov.ai/en/master/features/overview.html)
* Contribution Guide [*docs:contribution_guide/*](http://docs.deeppavlov.ai/en/master/devguides/contribution_guide.html)
* Issues [*github/issues/*](https://github.com/deepmipt/DeepPavlov/issues)
* Issues [*github/issues/*](https://github.com/deeppavlov/DeepPavlov/issues)
* Forum [*forum.deeppavlov.ai*](https://forum.deeppavlov.ai/)
* Blogs [*medium.com/deeppavlov*](https://medium.com/deeppavlov)
* Tutorials [*examples/*](https://github.com/deepmipt/DeepPavlov/tree/master/examples) and [extended colab tutorials](https://github.com/deepmipt/dp_tutorials)
* Tutorials [*examples/*](examples) and [extended colab tutorials](https://github.com/deeppavlov/dp_tutorials)
* Docker Hub [*hub.docker.com/u/deeppavlov/*](https://hub.docker.com/u/deeppavlov/)
* Docker Images Documentation [*docs:docker-images/*](http://docs.deeppavlov.ai/en/master/intro/installation.html#docker-images)

Expand Down Expand Up @@ -194,7 +194,3 @@ model = evaluate_model(<config_path>, download=True)
DeepPavlov is Apache 2.0 - licensed.

##

<p align="center">
<img src="docs/_static/ipavlov_footer.png" width="50%" height="50%"/>
</p>
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@
'udapi', 'whapi']

extlinks = {
'config': (f'https://github.com/deepmipt/DeepPavlov/blob/{release}/deeppavlov/configs/%s', None),
'dp_file': (f'https://github.com/deepmipt/DeepPavlov/blob/{release}/%s', None)
'config': (f'https://github.com/deeppavlov/DeepPavlov/blob/{release}/deeppavlov/configs/%s', None),
'dp_file': (f'https://github.com/deeppavlov/DeepPavlov/blob/{release}/%s', None)
}

# -- Options for intersphinx extension ---------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions docs/devguides/contribution_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ you can receive an invitation to one of our events or an opportunity to become a
How to contribute:

#. Don't start the coding first.
You should do a quick search over `existing issues <https://github.com/deepmipt/DeepPavlov/issues?q=is%3Aissue>`_
You should do a quick search over `existing issues <https://github.com/deeppavlov/DeepPavlov/issues?q=is%3Aissue>`_
for the project to see if your suggestion was already discussed or even resolved.
If nothing relevant was found, please create a new one and state what exactly you would like
to implement or fix.
You may proceed with coding once someone on our team accepts your offer.

#. `Fork <https://guides.github.com/activities/forking/>`_ the
`DeepPavlov repository <https://github.com/deepmipt/DeepPavlov>`_
`DeepPavlov repository <https://github.com/deeppavlov/DeepPavlov>`_

#. Checkout the ``dev`` branch from
`the upstream <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork>`_
Expand All @@ -33,7 +33,7 @@ How to contribute:
git clone https://github.com/<OWNER>/<REPOSITORY>.git
cd <REPOSITORY>
git remote add upstream https://github.com/deepmipt/DeepPavlov.git
git remote add upstream https://github.com/deeppavlov/DeepPavlov.git
git fetch upstream
git checkout -b dev --track upstream/dev
Expand Down Expand Up @@ -84,7 +84,7 @@ How to contribute:
#. We ask you to **add some tests**. This will help us maintain the
framework, and this will help users to understand the feature you introduce.
Examples of implemented tests are available in `tests/
<https://github.com/deepmipt/DeepPavlov/tree/dev/tests>`_
<https://github.com/deeppavlov/DeepPavlov/tree/dev/tests>`_
directory.

#. Please, **update the documentation**, if you committed significant changes
Expand All @@ -109,7 +109,7 @@ How to contribute:
Follow the `semantic commit notation <https://seesparkbox.com/foundry/semantic_commit_messages>`_
for the name of the commit.

#. Create a new `pull request <https://github.com/deepmipt/DeepPavlov/pulls>`_
#. Create a new `pull request <https://github.com/deeppavlov/DeepPavlov/pulls>`_
to get your feature branch merged into dev for others to use.
Don't forget to `reference <https://help.github.com/en/github/writing-on-github/autolinked-references-and-urls>`_
the GitHub issue associated with your task in the description.
Expand Down
4 changes: 2 additions & 2 deletions docs/features/models/kbqa.rst
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ Advanced: Using Wiki Parser As Standalone Service For KBQA
------------------------------------------------------------------------------
Default configuration for KBQA was designed to use all of the supporting models together as a part of the KBQA pipeline. However, there might be a case when you want to work with some of these models in addition to KBQA.

For example, you might want to use Wiki Parser component to directly run SPARQL queries against your copy of Wikidata. To support these usecase, starting with this release you can also deploy supporting models as standalone components.
For example, you might want to use Wiki Parser component to directly run SPARQL queries against your copy of Wikidata. To support these usecase, starting with this release you can also deploy supporting models as standalone components.

Config :config:`wiki_parser <kbqa/wiki_parser.json>` can be used as service with the following command:

.. code:: bash
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def read_requirements():
def readme():
with open(os.path.join(__location__, 'README.md'), encoding='utf8') as f:
text = f.read()
text = re.sub(r']\((?!https?://)', r'](https://github.com/deepmipt/DeepPavlov/blob/master/', text)
text = re.sub(r'\ssrc="(?!https?://)', r' src="https://raw.githubusercontent.com/deepmipt/DeepPavlov/master/', text)
text = re.sub(r']\((?!https?://)', r'](https://github.com/deeppavlov/DeepPavlov/blob/master/', text)
text = re.sub(r'\ssrc="(?!https?://)', r' src="https://raw.githubusercontent.com/deeppavlov/DeepPavlov/master/', text)
return text


Expand All @@ -56,8 +56,8 @@ def readme():
author=__author__,
author_email=__email__,
license=__license__,
url='https://github.com/deepmipt/DeepPavlov',
download_url=f'https://github.com/deepmipt/DeepPavlov/archive/{__version__}.tar.gz',
url='https://github.com/deeppavlov/DeepPavlov',
download_url=f'https://github.com/deeppavlov/DeepPavlov/archive/{__version__}.tar.gz',
keywords=__keywords__,
include_package_data=True,
extras_require={
Expand Down

0 comments on commit ef1253c

Please sign in to comment.