Merge pull request #244 from dephell/new-domain

New domain
dephell · Jul 23, 2019 · c895ca4 · c895ca4
2 parents 14fe086 + 5cd9a13
commit c895ca4
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -21,27 +21,25 @@ Why it is better than all other tools:
 
 Features:
 
-+ Manage dependencies: [convert between formats](https://dephell.readthedocs.io/cmd-deps-convert.html), [instаll](https://dephell.readthedocs.io/cmd-deps-install.html), lock, [add new](https://dephell.readthedocs.io/cmd-deps-add.html), resolve conflicts.
-+ Manage virtual environments: [create](https://dephell.readthedocs.io/cmd-venv-create.html), [remove](https://dephell.readthedocs.io/cmd-venv-destroy.html), [inspect](https://dephell.readthedocs.io/cmd-inspect-venv.html), [run shell](https://dephell.readthedocs.io/cmd-venv-shell.html), [run commands inside](https://dephell.readthedocs.io/cmd-venv-run.html).
-+ [Install CLI tools](https://dephell.readthedocs.io/cmd-jail-install.html) into isolated environments.
-+ Manage packages: [install](https://dephell.readthedocs.io/cmd-package-install.html), [list](https://dephell.readthedocs.io/cmd-package-list.html), [search](https://dephell.readthedocs.io/cmd-package-search.html) on PyPI.
-+ [Build](https://dephell.readthedocs.io/cmd-project-build.html) packages (to upload on PyPI), [test](https://dephell.readthedocs.io/cmd-project-test.html), [bump project version](https://dephell.readthedocs.io/cmd-project-bump.html).
-+ [Discover licenses](https://dephell.readthedocs.io/cmd-deps-licenses.html) of all project dependencies, show [outdated](https://dephell.readthedocs.io/cmd-deps-outdated.html) packages, [find security issues](https://dephell.readthedocs.io/cmd-deps-audit.html).
-+ Generate [.editorconfig](https://dephell.readthedocs.io/cmd-generate-editorconfig.html), [LICENSE](https://dephell.readthedocs.io/cmd-generate-license.html), [AUTHORS](https://dephell.readthedocs.io/cmd-generate-authors.html), [.travis.yml](https://dephell.readthedocs.io/cmd-generate-travis.html).
++ Manage dependencies: [convert between formats](https://dephell.org/docs/cmd-deps-convert.html), [instаll](https://dephell.org/docs/cmd-deps-install.html), lock, [add new](https://dephell.org/docs/cmd-deps-add.html), resolve conflicts.
++ Manage virtual environments: [create](https://dephell.org/docs/cmd-venv-create.html), [remove](https://dephell.org/docs/cmd-venv-destroy.html), [inspect](https://dephell.org/docs/cmd-inspect-venv.html), [run shell](https://dephell.org/docs/cmd-venv-shell.html), [run commands inside](https://dephell.org/docs/cmd-venv-run.html).
++ [Install CLI tools](https://dephell.org/docs/cmd-jail-install.html) into isolated environments.
++ Manage packages: [install](https://dephell.org/docs/cmd-package-install.html), [list](https://dephell.org/docs/cmd-package-list.html), [search](https://dephell.org/docs/cmd-package-search.html) on PyPI.
++ [Build](https://dephell.org/docs/cmd-project-build.html) packages (to upload on PyPI), [test](https://dephell.org/docs/cmd-project-test.html), [bump project version](https://dephell.org/docs/cmd-project-bump.html).
++ [Discover licenses](https://dephell.org/docs/cmd-deps-licenses.html) of all project dependencies, show [outdated](https://dephell.org/docs/cmd-deps-outdated.html) packages, [find security issues](https://dephell.org/docs/cmd-deps-audit.html).
++ Generate [.editorconfig](https://dephell.org/docs/cmd-generate-editorconfig.html), [LICENSE](https://dephell.org/docs/cmd-generate-license.html), [AUTHORS](https://dephell.org/docs/cmd-generate-authors.html), [.travis.yml](https://dephell.org/docs/cmd-generate-travis.html).
 
-See [documentation](https://dephell.readthedocs.io/) for more details.
+See [documentation](https://dephell.org/docs/) for more details.
 
 Follow [@PythonDepHell](https://twitter.com/PythonDepHell) on Twitter to get updates about new features and releases.
 
 ## Installation
 
-The simplest way:
-
 ```bash
-python3 -m pip install --user dephell[full]
+curl -L dephell.org/install | python3
 ```
 
-See [installation documentation](https://dephell.readthedocs.io/installation.html) for better ways.
+See [installation documentation](https://dephell.org/docs/installation.html) for alternatives.
 
 ## Supported formats
 
@@ -249,7 +247,7 @@ INFO builded
 
 Now, we can upload these packages to [PyPI](https://pypi.org/) with [twine](https://github.com/pypa/twine/).
 
-These are some of the most useful commands. See [documentation](https://dephell.readthedocs.io/) for more details.
+These are some of the most useful commands. See [documentation](https://dephell.org/docs/) for more details.
 
 ## Compatibility
 

diff --git a/dephell/actions/_travis.py b/dephell/actions/_travis.py
@@ -17,7 +17,7 @@
   - tree
   # install DepHell
   # https://github.com/travis-ci/travis-ci/issues/8589
-  - curl https://raw.githubusercontent.com/dephell/dephell/master/install.py | /opt/python/3.7/bin/python
+  - curl -L dephell.org/install | /opt/python/3.7/bin/python
   - dephell inspect self
 install:
   - dephell venv create --env=$ENV --python="/opt/python/$TRAVIS_PYTHON_VERSION/bin/python"

diff --git a/dephell/commands/base.py b/dephell/commands/base.py
@@ -69,7 +69,7 @@ def _get_default_parser(cls, usage=''):
             prog='dephell ' + name,
             usage='dephell {} [OPTIONS] {}'.format(name, usage.upper()),
             description=cls.__doc__,
-            epilog='https://dephell.readthedocs.io/cmd-{}.html'.format(name.replace(' ', '-')),
+            epilog='https://dephell.org/docs/cmd-{}.html'.format(name.replace(' ', '-')),
         )
 
     @classmethod

diff --git a/docs/conf.py b/docs/conf.py
@@ -60,6 +60,7 @@
     'github_type': 'star',
 
     'extra_nav_links': {
+        'Home': 'https://dephell.org/',
         'GitHub repository': 'https://github.com/dephell/dephell',
         'Create an issue': 'https://github.com/dephell/dephell/issues/new',
     },

diff --git a/docs/installation.md b/docs/installation.md
@@ -1,12 +1,14 @@
 # Installation
 
-Recommend way:
+Stable version
 
 ```bash
-curl https://raw.githubusercontent.com/dephell/dephell/master/install.py | python3
+curl -L dephell.org/install | python3
 ```
 
-It will install DepHell into DepHell's jail ([WE NEED TO GO DEEPER](https://knowyourmeme.com/memes/we-need-to-go-deeper)). This link looks too long, so in the project's README represented another way:
+It will install DepHell into DepHell's jail ([WE NEED TO GO DEEPER](https://knowyourmeme.com/memes/we-need-to-go-deeper)).
+
+If installation script doesn't work:
 
 ```bash
 python3 -m pip install --user dephell[full]
@@ -23,7 +25,7 @@ python3 -m pip install --user dephell
 Install dev version inside of site-packages:
 
 ```bash
-wget https://raw.githubusercontent.com/dephell/dephell/master/install.py
+curl -L dephell.org/install > install.py
 python3 install.py --branch=master
 ```
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -107,8 +107,9 @@ authors = ["Gram <master_fess@mail.ru>"]
 description = "Dependency resolution for Python"
 readme = "README.md"
 license = "MIT"
+homepage = "https://dephell.org/"
 repository = "https://github.com/dephell/dephell"
-documentation = "https://dephell.readthedocs.io/ "
+documentation = "https://dephell.org/docs/"
 keywords = [
     "dephell", "packaging", "dependency", "dependencies", "venv", "licenses",
     "pip", "poetry", "pipfile", "pipenv", "setuptools",

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
     python_requires='>=3.5',
     project_urls={
         'repository': 'https://github.com/dephell/dephell',
-        'documentation': 'https://dephell.readthedocs.io/ '
+        'documentation': 'https://dephell.org/docs/'
     },
     author='Gram',
     author_email='master_fess@mail.ru',