Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Migrate to using pyproject.toml with hatch as build tool
- Allow installing js deps with pnpm install --prod for faster and smaller install
- (GH #514) Cypress integration tests run against keystone-swift container from https://github.com/CSCfi/docker-keystone-swift.
- Improved development workflow, and added development and testing instructions.
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pnpm install
pnpm run build
cd ..
pip install -r requirements.txt
pip install .
pip install .[]
```

After install there should be `swift-browser-ui` command available:
Expand Down Expand Up @@ -117,8 +117,7 @@ Install python dependencies, optionally in a virtual environment.
```bash
python3 -m venv venv --prompt swiftui # Optional step, creates python virtual environment
source venv/bin/activate # activates virtual environment
pip install -Ue .
pip install honcho # to run the Procfile
pip install -Ue .[docs,test,dev]
```

Set up the environment variables
Expand Down
72 changes: 72 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
name = "swift-browser-ui"
dynamic = ["version"]
description = "Object browser Web UI for Openstack Swift API"
readme = "README.md"
license = "MIT"
authors = [
{ name = "CSC Developers" },
]
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Intended Audience :: Information Technology",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.10",
"Topic :: Internet :: WWW/HTTP :: HTTP Servers",
]
dependencies = [
"aiohttp-session==2.12.0",
"aiohttp==3.8.3",
"aioredis==2.0.1",
"asyncpg==0.27.0",
"certifi==2022.12.7",
"click==8.1.3",
"cryptography==39.0.1",
"gunicorn==20.1.0",
"keystoneauth1==5.1.1",
"oidcrp==2.1.4",
"python-swiftclient==4.1.0",
"uvloop==0.17.0",
]

[project.optional-dependencies]
docs = [
"sphinx==6.1.3",
"sphinx_rtd_theme==1.2.0",
]
test = [
"black==23.1.0",
"coverage==7.1.0",
"flake8-docstrings==1.7.0",
"flake8==6.0.0",
"mypy==1.0.1",
"pytest-cov==4.0.0",
"pytest-xdist==3.1.0",
"pytest==7.2.1",
"tox==4.4.4",
]
ui_test = [
"pytest-timeout==2.1.0",
"pytest==7.2.1",
]
dev = [
"honcho==1.1.0",
"pyspelling==2.8.2",
]

[project.scripts]
swift-browser-ui = "swift_browser_ui.launcher:run_ui"
swift-sharing-request = "swift_browser_ui.launcher:run_request"
swift-upload-runner = "swift_browser_ui.launcher:run_upload"
swift-x-account-sharing = "swift_browser_ui.launcher:run_sharing"

[project.urls]
Source = "https://github.com/CSCfi/swift-browser-ui"

[tool.hatch.version]
path = "swift_browser_ui/__init__.py"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ aioredis==2.0.1
asyncpg==0.27.0
certifi==2022.12.7
click==8.1.3
cryptography==39.0.0
cryptography==39.0.1
gunicorn==20.1.0
keystoneauth1==5.1.1
oidcrp==2.1.4
Expand Down
73 changes: 0 additions & 73 deletions setup.py

This file was deleted.

Empty file.
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ deps =
skip_instal = true
deps =
black
commands = black swift_browser_ui tests setup.py -l 90 --check
commands = black swift_browser_ui tests -l 90 --check

[gh-actions]
python =
Expand Down