Skip to content

Commit

Permalink
Merge pull request #996 from nextcloud/update-poetry
Browse files Browse the repository at this point in the history
fix CI, drop python 3.6 support
  • Loading branch information
bigcat88 authored May 5, 2023
2 parents f80e1b2 + aa5456c commit 48e10c6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/yarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install poetry
run: pip install poetry==1.1.12
run: |
pip install "urllib3<2"
pip install poetry==1.4.2
- uses: browser-actions/setup-firefox@latest
with:
firefox-version: latest
Expand All @@ -67,6 +69,7 @@ jobs:
with:
parallel: true
flag-name: Unit Test

coveralls_finish:
needs: test
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion docs/devinstall.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Install poetry
--------------
Install poetry to handle python dependencies::

pip install poetry==1.1.12
pip install poetry==1.4.2

App Store Setup
---------------
Expand Down
2 changes: 1 addition & 1 deletion docs/prodinstall.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Next install the required libraries::

pip install --upgrade wheel
pip install --upgrade pip
pip install poetry==1.1.12
pip install poetry==1.4.2

Setting Up Poetry
-----------------
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[tool.poetry]
name = "nextcloudappstore/"
version = "1.0.0"
name = "nextcloudappstore"
version = "4.0.0"
description = "App store for Nextcloud apps"
authors = ["Morris Jobke <[email protected]>"]

[tool.poetry.dependencies]
python = "^3.6"
python = "^3.7"
Django = "~3.2"
django-braces = "~1.13"
djangorestframework-camel-case = "^1.3.0"
django-parler-rest = "^2.1"
django-parler = "^2.3"
django-allauth = "^0.47.0"
lxml = "^4.7.1"
requests = "^2.27.0"
requests = ">=2.27.0, <2.30.0" # till cachecontrol get updated
django-cors-middleware = "^1.5.0"
django-csp = "^3.7"
pyOpenSSL = "^23.0.0"
Expand All @@ -38,7 +38,7 @@ mypy = "*"
bandit = "*"
django-debug-toolbar = "*"
coverage = "*"
selenium = ""
selenium = "*"
coveralls = "*"
types-requests = "^2.26.3"
types-pyOpenSSL = "^23.0.0"
Expand Down

0 comments on commit 48e10c6

Please sign in to comment.