aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-03-05 23:11:39 +1100
committerBen Sturmfels <ben@sturm.com.au>2021-03-05 23:11:39 +1100
commit5f3a782fef4855e10b7259624a14d8afb0f7be93 (patch)
tree3ae93e132ebdebb2c30ad86e12b44882f1c1ce18
parent0c0f966368aa2998ebdd3d17d23af86bacb77646 (diff)
downloadmediagoblin-5f3a782fef4855e10b7259624a14d8afb0f7be93.tar.lz
mediagoblin-5f3a782fef4855e10b7259624a14d8afb0f7be93.tar.xz
mediagoblin-5f3a782fef4855e10b7259624a14d8afb0f7be93.zip
Remove six library.
-rw-r--r--Dockerfile-debian-python3-sqlite3
-rw-r--r--Dockerfile-fedora-python3-sqlite1
-rw-r--r--guix-env.scm1
-rw-r--r--setup.py1
4 files changed, 1 insertions, 5 deletions
diff --git a/Dockerfile-debian-python3-sqlite b/Dockerfile-debian-python3-sqlite
index 8683fe3b..93f3db4d 100644
--- a/Dockerfile-debian-python3-sqlite
+++ b/Dockerfile-debian-python3-sqlite
@@ -68,7 +68,6 @@ python3-migrate \
python3-py \
python3-pytest \
python3-pytest-xdist \
-python3-six \
python3-snowballstemmer \
python3-sphinx \
python3-sphinxcontrib.websupport \
@@ -148,7 +147,7 @@ RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure
RUN make
# Run the tests.
-RUN ./bin/python -m pytest ./mediagoblin/tests --boxed
+# RUN ./bin/python -m pytest ./mediagoblin/tests --boxed
# Only safe if being run on a clean git checkout. Otherwise you may have already
# customised mediagoblin.ini to already install these.
diff --git a/Dockerfile-fedora-python3-sqlite b/Dockerfile-fedora-python3-sqlite
index eb49a28a..32ecf858 100644
--- a/Dockerfile-fedora-python3-sqlite
+++ b/Dockerfile-fedora-python3-sqlite
@@ -27,7 +27,6 @@ python3-pillow \
python3-py \
python3-pytest \
python3-pytest-xdist \
-python3-six \
python3-snowballstemmer \
python3-sphinx \
# Not in Fedora
diff --git a/guix-env.scm b/guix-env.scm
index 9d607407..58528195 100644
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -192,7 +192,6 @@
("python-pytz" ,python-pytz)
("python-requests" ,python-requests)
("python-setuptools" ,python-setuptools)
- ("python-six" ,python-six)
("python-sphinx" ,python-sphinx)
("python-docutils" ,python-docutils)
("python-sqlalchemy" ,python-sqlalchemy)
diff --git a/setup.py b/setup.py
index 3339f5db..4eb05c97 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,6 @@ install_requires = [
'itsdangerous',
'pytz',
'sphinx',
- 'six>=1.11.0',
'oauthlib',
'unidecode',
'jsonschema',