v2.0.0v2.0.0

11 files changed, 34 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 3e7c5a0..48acc3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,22 @@
+.PHONY: build
+
 install:
 	python -m pip install -e .
 	python -m pip install -r requirements-test.txt
 
+clean:
+	rm -rf dist/ build/
+
 test:
 	python -m pytest
+
+build:
+	python setup.py sdist bdist_wheel
+
+check:
+	twine check dist/*
+
+upload:
+	twine upload --repository=http-prompt dist/*
+
+release: test clean build check upload
diff --git a/README.rst b/README.rst
index f29f24b..21d3644 100644
--- a/README.rst
+++ b/README.rst
@@ -15,7 +15,7 @@ Links
 * Home: https://http-prompt.com
 * Documentation: https://docs.http-prompt.com
 * Code: https://github.com/httpie/http-prompt
-* Chat: https://gitter.im/eliangcs/http-prompt
+* Chat: https://httpie.io/chat
 
 
 .. |PyPI| image:: https://img.shields.io/pypi/v/http-prompt.svg
@@ -31,10 +31,10 @@ Links
     :target: https://coveralls.io/github/eliangcs/http-prompt?branch=master
 
 .. |Gitter| image:: https://badges.gitter.im/eliangcs/http-prompt.svg
-    :target: https://gitter.im/eliangcs/http-prompt
+    :target: https://httpie.io/chat
 
 .. |Asciinema| image:: https://asciinema.org/a/96613.png
     :target: https://asciinema.org/a/96613?theme=monokai&size=medium&autoplay=1&speed=1.5
 
-.. _HTTPie: https://httpie.org
+.. _HTTPie: https://httpie.io
 .. _prompt_toolkit: https://github.com/jonathanslenders/python-prompt-toolkit
diff --git a/docs/LICENSE b/docs/LICENSE
index 74b150a..197ef73 100644
--- a/docs/LICENSE
+++ b/docs/LICENSE
@@ -1,3 +1,3 @@
 Refer to LICENSE in the main repo:
 
-https://github.com/eliangcs/http-prompt
+https://github.com/httpie/http-prompt
diff --git a/docs/README.md b/docs/README.md
index c48acec..d68bd11 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,7 +2,7 @@
 
 This repo contains the documentation for HTTP Prompt, published on
 http://docs.http-prompt.com. The source code of HTTP Prompt can be found in the
-main repo: https://github.com/eliangcs/http-prompt
+main repo: https://github.com/httpie/http-prompt
 
 ## How to Build
 
diff --git a/docs/conf.py b/docs/conf.py
index 91f8635..1cfcaa8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -167,7 +167,7 @@ html_sidebars = {
 html_theme_options = {
     'extra_nav_links': OrderedDict([
         ('Home', 'http://http-prompt.com'),
-        ('Chat on Gitter', 'https://gitter.im/eliangcs/http-prompt'),
-        ('Code on GitHub', 'https://github.com/eliangcs/http-prompt'),
+        ('Discord', 'https://httpie.io/chat'),
+        ('Code on GitHub', 'https://github.com/httpie/http-prompt'),
     ])
 }
diff --git a/docs/contributor-guide.rst b/docs/contributor-guide.rst
index df00764..51f84e2 100644
--- a/docs/contributor-guide.rst
+++ b/docs/contributor-guide.rst
@@ -137,12 +137,10 @@ Before you add a new feature, make sure you create an issue making a proposal
 first, because you don't want to waste your time on something that the
 community don't agree upon.
 
-Python 2 and 3 Compatibility
+Python Compatibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-HTTP Prompt is compatible with Python 2 and 3. Keep in mind that you're coding
-for Python 2 and 3 at the same time. You can use Tox_ (see below) to make sure
-the code is runnable on both Python 2 and 3.
+HTTP Prompt is compatible with Python 3.6+.
 
 Documentation
 ~~~~~~~~~~~~~
diff --git a/docs/index.rst b/docs/index.rst
index 1772edf..2cd985d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -60,9 +60,9 @@ Thanks
     :target: https://asciinema.org/a/96613?theme=monokai&size=medium&autoplay=1&speed=1.5
 
 .. _Contributors: https://github.com/eliangcs/http-prompt/graphs/contributors
-.. _GitHub issues: https://github.com/eliangcs/http-prompt/issues
-.. _Gitter chat room: https://gitter.im/eliangcs/http-prompt
-.. _HTTPie: https://httpie.org
+.. _GitHub issues: https://github.com/httpie/http-prompt/issues
+.. _Discord: https://htpie.io/chat
+.. _HTTPie: https://httpie.io
 .. _Parsimonious: https://github.com/erikrose/parsimonious
 .. _pgcli: http://pgcli.com
 .. _prompt_toolkit: https://github.com/jonathanslenders/python-prompt-toolkit
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 0dc22d1..dac089a 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -362,7 +362,7 @@ only person who can read it is the owner (you).
 last context instead of grouping multiple contexts by hostnames and ports like
 it did previously. We changed the behavior because the feature can be simply
 replaced by ``env``, ``exec`` and ``source`` commands. See the discussion in
-`issue #70 <https://github.com/eliangcs/http-prompt/issues/70>`_ for detail.
+`issue #70 <https://github.com/httpie/http-prompt/issues/70>`_ for detail.
 
 
 ``ls``, ``cd``, and OpenAPI/Swagger Specification
diff --git a/http_prompt/__init__.py b/http_prompt/__init__.py
index 1f356cc..afced14 100644
--- a/http_prompt/__init__.py
+++ b/http_prompt/__init__.py
@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = '2.0.0'
diff --git a/requirements-test.txt b/requirements-test.txt
index 2e24407..05fa39f 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,3 +2,5 @@ mock>=2.0.0
 pexpect>=4.2.1
 pytest>=3.0.6
 pytest-cov>=2.4.0
+wheel
+twine
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 9831f3a..3b578a9 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ def read_requirements(filename):
 setup(
     name='http-prompt',
     version=find_version('http_prompt', '__init__.py'),
-    url='https://github.com/eliangcs/http-prompt',
+    url='https://github.com/httpie/http-prompt',
     description='An interactive HTTP command-line client',
     long_description=read_description('README.rst'),
     author='Chang-Hung Liang',
@@ -74,5 +74,6 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ]
 )