From ee24b9efd039bdb5473de3b9508183f55dc78dbb Mon Sep 17 00:00:00 2001 From: Michael Diamant Date: Wed, 20 Apr 2022 20:18:39 -0400 Subject: [PATCH] Revert "Bump up minimum Python version to 3.10 (#313)" (#315) This reverts commit 006b3a09fbb1e7ce57703fe32d9ad9fdeed6ba0f. --- .circleci/config.yml | 4 ++-- .readthedocs.yaml | 29 ----------------------------- .travis.yml | 10 ++++++++++ Dockerfile | 2 +- README.md | 2 -- docs/conf.py | 2 +- docs/requirements.txt | 4 ++-- setup.py | 2 +- 8 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 .readthedocs.yaml create mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 95f73764..3cf70366 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ workflows: jobs: unit-test: docker: - - image: python:3.10 + - image: python:3.7.9 steps: - checkout - run: pip install -r requirements.txt @@ -26,7 +26,7 @@ jobs: docset: docker: # NOTE: We might eventually need Docker authentication here. - - image: cimg/python:3.10 + - image: cimg/python:3.9 steps: - checkout - run: diff --git a/.readthedocs.yaml b/.readthedocs.yaml deleted file mode 100644 index ff605975..00000000 --- a/.readthedocs.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# .readthedocs.yaml -# Read the Docs configuration file -# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details - -# Required -version: 2 - -# Set the version of Python and other tools you might need -build: - os: ubuntu-20.04 - tools: - python: "3.10" - # You can also specify other tool versions: - # nodejs: "16" - # rust: "1.55" - # golang: "1.17" - -# Build documentation in the docs/ directory with Sphinx -sphinx: - configuration: docs/conf.py - -# If using Sphinx, optionally build your docs in additional formats such as PDF -# formats: -# - pdf - -# Optionally declare the Python requirements required to build your docs -python: - install: - - requirements: docs/requirements.txt diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..866345de --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +dist: bionic +language: python +python: + - "3.7" +script: + - black --check . + - set -e + - if [ -n "$DOCKER_PASSWORD" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ; fi + - python3 test_unit.py + - make docker-test \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 88062497..60c0721b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.7.9 # Copy SDK code into the container RUN mkdir -p $HOME/py-algorand-sdk diff --git a/README.md b/README.md index 348a9ffe..41436ead 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,6 @@ Run `$ pip3 install py-algorand-sdk` to install the package. Alternatively, choose a [distribution file](https://pypi.org/project/py-algorand-sdk/#files), and run `$ pip3 install [file name]`. -The py-algorand-sdk requires Python `3.10` to be installed. Please upgrade your Python version or consider using tools to manage multiple Python versions like [pyenv](https://github.com/pyenv/pyenv). - ## SDK Development Install dependencies diff --git a/docs/conf.py b/docs/conf.py index 7eb2d22d..0b473fcb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,7 +19,7 @@ # -- Project information ----------------------------------------------------- project = "algosdk" -copyright = "2022 Algorand" +copyright = "2020 Algorand" author = "Algorand" diff --git a/docs/requirements.txt b/docs/requirements.txt index 88b9acb6..3c0f2563 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==4.2.0 -sphinx-rtd-theme==1.0.0 +sphinx==4.0.1 +sphinx-rtd-theme m2r2 diff --git a/setup.py b/setup.py index 29ef2804..6d3cf6cd 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ "msgpack>=1.0.0,<2", ], packages=setuptools.find_packages(), - python_requires=">=3.10", + python_requires=">=3.5", package_data={"": ["data/langspec.json"]}, include_package_data=True, )