Skip to content

Commit

Permalink
Merge pull request #203 from uploadcare/chore/rtd
Browse files Browse the repository at this point in the history
Reviving RTD
  • Loading branch information
dmitry-mukhin committed Jul 26, 2022
2 parents 0760396 + fe8588b commit 0805e75
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
Expand All @@ -38,12 +38,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Poetry
Expand Down
16 changes: 16 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.10"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

python:
install:
- method: pip
path: .
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Features
Requirements
============

``pyuploadcare`` requires Python 3.6, 3.7, 3.8, 3.9.
``pyuploadcare`` requires Python >=3.6,<4.0.

To use ``pyuploadcare`` with Python 2.7 please install ``pyuploadcare < 3.0``.

Expand Down
13 changes: 8 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@

# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ["sphinx.ext.autodoc", "sphinxarg.ext"]
extensions = [
"sphinx.ext.autodoc",
# "sphinxarg.ext"
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
Expand All @@ -45,7 +48,7 @@

# General information about the project.
project = "PyUploadcare"
copyright = "2011-2015, Uploadcare LLC"
copyright = "2011-2022, Uploadcare Inc"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down Expand Up @@ -192,7 +195,7 @@
"index",
"PyUploadcare.tex",
"PyUploadcare Documentation",
"Uploadcare LLC",
"Uploadcare Inc",
"manual",
),
]
Expand Down Expand Up @@ -227,7 +230,7 @@
"index",
"pyuploadcare",
"PyUploadcare Documentation",
["Uploadcare LLC"],
["Uploadcare Inc"],
1,
)
]
Expand All @@ -246,7 +249,7 @@
"index",
"PyUploadcare",
"PyUploadcare Documentation",
"Uploadcare LLC",
"Uploadcare Inc",
"PyUploadcare",
"Python library for Uploadcare.",
"Miscellaneous",
Expand Down
8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ classifiers = [
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'License :: OSI Approved :: MIT License',
]

Expand All @@ -36,7 +37,10 @@ Django = {version = ">=1.11", optional = true}
django = ["Django"]

[tool.poetry.dev-dependencies]
pytest = "^5.2"
pytest = [
{version = "^5.2", python = ">=3.6,<3.7"},
{version = "^7.1", python = "^3.7"}
]
tox = "^3.24.1"
black = "^21.7b0"
isort = "^5.9.3"
Expand All @@ -61,7 +65,7 @@ build-backend = "poetry.core.masonry.api"

[tool.black]
line-length = 79
target-version = ['py36']
target-version = ['py39']
exclude = '''
(
\.eggs
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# https://devguide.python.org/#branchstatus
# https://devguide.python.org/versions/
# https://www.djangoproject.com/download/#supported-versions
# https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django

[tox]
isolated_build = True
envlist=
# core lib tests
py{36,37,38,39}-api,
py{36,37,38,39,310}-api,

# old django versions
py{36,37}-dj1.11-django
Expand All @@ -29,6 +29,7 @@ basepython =
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
deps =
pytest
mock
Expand Down

0 comments on commit 0805e75

Please sign in to comment.