tarantool · DifferentialOrange · Oct 21, 2022 · Oct 7, 2022 · Oct 7, 2022
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install test
+.PHONY: install test docs
 install:
 	pip install --editable .
 test:
@@ -19,5 +19,3 @@ dist-upload-2:
 	python setup.py sdist --format=ztar upload
 docs:
 	python setup.py build_sphinx
-docs-upload: docs
-	python setup.py upload_sphinx
diff --git a/README.rst b/README.rst
@@ -112,7 +112,7 @@ To build documentation, first you must install its build requirements:
 
 .. code-block:: bash
 
-    $ pip install -r requirements-doc.txt
+    $ pip install -r docs/requirements.txt
 
 Then run
 

diff --git a/requirements-doc.txt → docs/requirements.txt b/requirements-doc.txt → docs/requirements.txt
diff --git a/...atic/favicon/apple-touch-icon-114x114.png → ...atic/favicon/apple-touch-icon-114x114.png b/...atic/favicon/apple-touch-icon-114x114.png → ...atic/favicon/apple-touch-icon-114x114.png
diff --git a/...atic/favicon/apple-touch-icon-120x120.png → ...atic/favicon/apple-touch-icon-120x120.png b/...atic/favicon/apple-touch-icon-120x120.png → ...atic/favicon/apple-touch-icon-120x120.png
diff --git a/...atic/favicon/apple-touch-icon-144x144.png → ...atic/favicon/apple-touch-icon-144x144.png b/...atic/favicon/apple-touch-icon-144x144.png → ...atic/favicon/apple-touch-icon-144x144.png
diff --git a/...atic/favicon/apple-touch-icon-152x152.png → ...atic/favicon/apple-touch-icon-152x152.png b/...atic/favicon/apple-touch-icon-152x152.png → ...atic/favicon/apple-touch-icon-152x152.png
diff --git a/...static/favicon/apple-touch-icon-57x57.png → ...static/favicon/apple-touch-icon-57x57.png b/...static/favicon/apple-touch-icon-57x57.png → ...static/favicon/apple-touch-icon-57x57.png
diff --git a/...static/favicon/apple-touch-icon-60x60.png → ...static/favicon/apple-touch-icon-60x60.png b/...static/favicon/apple-touch-icon-60x60.png → ...static/favicon/apple-touch-icon-60x60.png
diff --git a/...static/favicon/apple-touch-icon-72x72.png → ...static/favicon/apple-touch-icon-72x72.png b/...static/favicon/apple-touch-icon-72x72.png → ...static/favicon/apple-touch-icon-72x72.png
diff --git a/...static/favicon/apple-touch-icon-76x76.png → ...static/favicon/apple-touch-icon-76x76.png b/...static/favicon/apple-touch-icon-76x76.png → ...static/favicon/apple-touch-icon-76x76.png
diff --git a/doc/_static/favicon/generate-png.sh → docs/source/_static/favicon/generate-png.sh b/doc/_static/favicon/generate-png.sh → docs/source/_static/favicon/generate-png.sh
diff --git a/doc/_static/favicon/icon-128x128.png → docs/source/_static/favicon/icon-128x128.png b/doc/_static/favicon/icon-128x128.png → docs/source/_static/favicon/icon-128x128.png
diff --git a/doc/_static/favicon/icon-16x16.png → docs/source/_static/favicon/icon-16x16.png b/doc/_static/favicon/icon-16x16.png → docs/source/_static/favicon/icon-16x16.png
diff --git a/doc/_static/favicon/icon-196x196.png → docs/source/_static/favicon/icon-196x196.png b/doc/_static/favicon/icon-196x196.png → docs/source/_static/favicon/icon-196x196.png
diff --git a/doc/_static/favicon/icon-32x32.png → docs/source/_static/favicon/icon-32x32.png b/doc/_static/favicon/icon-32x32.png → docs/source/_static/favicon/icon-32x32.png
diff --git a/doc/_static/favicon/icon-96x96.png → docs/source/_static/favicon/icon-96x96.png b/doc/_static/favicon/icon-96x96.png → docs/source/_static/favicon/icon-96x96.png
diff --git a/doc/_static/favicon/icon.svg → docs/source/_static/favicon/icon.svg b/doc/_static/favicon/icon.svg → docs/source/_static/favicon/icon.svg
diff --git a/doc/api/module-tarantool.rst → docs/source/api/module-tarantool.rst b/doc/api/module-tarantool.rst → docs/source/api/module-tarantool.rst
diff --git a/doc/api/submodule-connection-pool.rst → .../source/api/submodule-connection-pool.rst b/doc/api/submodule-connection-pool.rst → .../source/api/submodule-connection-pool.rst
diff --git a/doc/api/submodule-connection.rst → docs/source/api/submodule-connection.rst b/doc/api/submodule-connection.rst → docs/source/api/submodule-connection.rst
diff --git a/doc/api/submodule-dbapi.rst → docs/source/api/submodule-dbapi.rst b/doc/api/submodule-dbapi.rst → docs/source/api/submodule-dbapi.rst
diff --git a/doc/api/submodule-error.rst → docs/source/api/submodule-error.rst b/doc/api/submodule-error.rst → docs/source/api/submodule-error.rst
diff --git a/doc/api/submodule-mesh-connection.rst → .../source/api/submodule-mesh-connection.rst b/doc/api/submodule-mesh-connection.rst → .../source/api/submodule-mesh-connection.rst
diff --git a/doc/api/submodule-msgpack-ext-types.rst → ...ource/api/submodule-msgpack-ext-types.rst b/doc/api/submodule-msgpack-ext-types.rst → ...ource/api/submodule-msgpack-ext-types.rst
diff --git a/doc/api/submodule-msgpack-ext.rst → docs/source/api/submodule-msgpack-ext.rst b/doc/api/submodule-msgpack-ext.rst → docs/source/api/submodule-msgpack-ext.rst
diff --git a/doc/api/submodule-request.rst → docs/source/api/submodule-request.rst b/doc/api/submodule-request.rst → docs/source/api/submodule-request.rst
diff --git a/doc/api/submodule-response.rst → docs/source/api/submodule-response.rst b/doc/api/submodule-response.rst → docs/source/api/submodule-response.rst
diff --git a/doc/api/submodule-schema.rst → docs/source/api/submodule-schema.rst b/doc/api/submodule-schema.rst → docs/source/api/submodule-schema.rst
diff --git a/doc/api/submodule-space.rst → docs/source/api/submodule-space.rst b/doc/api/submodule-space.rst → docs/source/api/submodule-space.rst
diff --git a/doc/api/submodule-utils.rst → docs/source/api/submodule-utils.rst b/doc/api/submodule-utils.rst → docs/source/api/submodule-utils.rst
diff --git a/doc/conf.py → docs/source/conf.py b/doc/conf.py → docs/source/conf.py
diff --git a/doc/dev-guide.rst → docs/source/dev-guide.rst b/doc/dev-guide.rst → docs/source/dev-guide.rst
diff --git a/doc/index.rst → docs/source/index.rst b/doc/index.rst → docs/source/index.rst
diff --git a/doc/quick-start.rst → docs/source/quick-start.rst b/doc/quick-start.rst → docs/source/quick-start.rst
diff --git a/setup.py b/setup.py
@@ -44,19 +44,6 @@ def run(self):
     pass
 
 
-# Upload Sphinx documentation to PyPI (using Sphinx-PyPI-upload)
-# python setup.py build_sphinx
-# updates documentation at http://packages.python.org/tarantool/
-try:
-    from sphinx_pypi_upload import UploadDoc
-    cmdclass["upload_sphinx"] = UploadDoc
-    command_options["upload_sphinx"] = {
-        'upload_dir': ('setup.py', os.path.join("build", "sphinx", "html"))
-    }
-except ImportError:
-    pass
-
-
 # Test runner
 # python setup.py test
 try: