From 0e0d0f56890e3d283323ac90c54051372ab1ea56 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sun, 3 May 2020 14:04:54 -0700
Subject: [PATCH] Update onionshare description, and reduce python version to
 3.6 in pyproject.toml

---
 pyproject.toml      |  4 ++--
 setup.py            | 26 ++++++--------------------
 snap/snapcraft.yaml |  5 ++++-
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index fa83d133..34851025 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "onionshare"
 version = "2.2"
-description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service."
+description = "Securely and anonymously send and receive files, and publish onion sites"
 authors = ["Micah Lee <micah@micahflee.com>"]
 license = "GPLv3+"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.6"
 altgraph = "*"
 certifi = "*"
 chardet = "*"
diff --git a/setup.py b/setup.py
index 21e435b4..47514d73 100644
--- a/setup.py
+++ b/setup.py
@@ -33,25 +33,12 @@ def file_list(path):
 
 version = open("share/version.txt").read().strip()
 description = (
-    """OnionShare lets you securely and anonymously send and receive files. It """
-    """works by starting a web server, making it accessible as a Tor onion """
-    """service, and generating an unguessable web address so others can download """
-    """files from you, or upload files to you. It does _not_ require setting up """
-    """a separate server or using a third party file-sharing service."""
-)
-long_description = (
-    description
-    + "\n\n"
-    + (
-        """If you want to send files to someone, OnionShare hosts them on your own """
-        """computer and uses a Tor onion service to make them temporarily accessible """
-        """over the internet. The receiving user just needs to open the web address """
-        """in Tor Browser to download the files. If you want to receive files, """
-        """OnionShare hosts an anonymous dropbox directly on your computer and uses """
-        """a Tor onion service to make it temporarily accessible over the internet. """
-        """Other users can upload files to you from by loading the web address in """
-        """Tor Browser."""
-    )
+    """OnionShare is an open source tool for securely and anonymously sending and """
+    """receiving files and publishing websites using Tor onion services. It works by """
+    """starting a web server directly on your computer and making it accessible as """
+    """an unguessable Tor web address that others can load in Tor Browser. It """
+    """doesn't require setting up a separate server, using a third party service, or """
+    """even logging into an account."""
 )
 author = "Micah Lee"
 author_email = "micah@micahflee.com"
@@ -92,7 +79,6 @@ setup(
     name="onionshare",
     version=version,
     description=description,
-    long_description=long_description,
     author=author,
     author_email=author_email,
     maintainer=author,
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7abf29ce..d113af21 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -37,10 +37,13 @@ apps:
 
 parts:
   onionshare:
-    source: .
+    source: https://github.com/micahflee/onionshare.git
+    source-type: git
+    source-branch: 1111_snap
     plugin: python
     python-version: python3
     python-packages:
+      - poetry
       - Click
       - Flask
       - Flask-HTTPAuth