Skip to content

Update specifics of Python version in pyproject.toml etc #2620 #2623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2023
Merged

Update specifics of Python version in pyproject.toml etc #2620 #2623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
set -o errexit

# Install Poetry, a dependency management, packaging, and build system.
# We currently require Python 2.7 compatibility which was last in v1.1.15.
# We currently require Python 3.6 compatibility which was last in v1.1.15.
# We use the official installer which installs to: ~/.local/share/pypoetry.
# The installer is python 3 only: https://python-poetry.org/docs/#installation
# N.B. there is no harm in re-running this installer.
# For first-install on Tumbleweed instances with Py3.11 as default:
# 1. uninstall vai: curl -sSL https://install.python-poetry.org | python3 - --uninstall
# 2. change 3 to 3.8 in the following:
curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.1.15 python3 -

# Install project dependencies defined in cwd pyproject.toml using poetry.toml
Expand Down
4 changes: 2 additions & 2 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@ generate-setup-file = false

[tool.poetry.dependencies]
# We use groups (>=1.2.0) to clarify our dependencies (essentially labels):
# We currently need Poetry 1.1.15 for it's Python 2.7 compatibility.
# We currently need Poetry 1.1.15 for it's Python 2.7/3.6 compatibility.
# https://python-poetry.org/history/#120b1---2022-03-17
# 1.20b1 dropped Python 3.6 support.
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
#
# https://python-poetry.org/docs/1.1/dependency-specification/
python = "~3.6"
# https://python-poetry.org/docs/dependency-specification
python = ">= 3.6, < 3.9"

# [tool.poetry.group.django.dependencies]
django = "==1.11.29"
Expand Down
2 changes: 1 addition & 1 deletion src/rockstor/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

# Establish BASE_DIR from ourselves (./src/rockstor/settings.py)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
# print "BASE_DIR={}".format(BASE_DIR) # "/opt/rockstor" via 'django-admin runserver'
# print("BASE_DIR={}".format(BASE_DIR)) # "/opt/rockstor" via 'django-admin runserver'

# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
Expand Down