summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-16 11:34:53 +0100
committerErik Johnston <erik@matrix.org>2020-10-16 11:34:53 +0100
commite9b5e642c3d090abe03f9a86ac1060705e1eecb6 (patch)
treec577ae08545b4419e99b9802501f5187d5e36fe0 /setup.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #8535 from matrix-org/rav/third_party_events_updates (diff)
downloadsynapse-e9b5e642c3d090abe03f9a86ac1060705e1eecb6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/setup.py b/setup.py

index 926b1bc86f..08843fe2a3 100755 --- a/setup.py +++ b/setup.py
@@ -15,12 +15,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import glob import os -from setuptools import setup, find_packages, Command -import sys +from setuptools import Command, find_packages, setup here = os.path.abspath(os.path.dirname(__file__))