Skip to content

Commit

Permalink
Replace setup.py with more modern pyproject.toml (#22)
Browse files Browse the repository at this point in the history
Also:

* Update python version to 3.9
* Remove reentry from tests.
  • Loading branch information
yakutovicha authored Dec 21, 2023
1 parent 7a08d45 commit 7d763e1
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 106 deletions.
27 changes: 3 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
python-version: [3.8]
python-version: [3.9]
backend: ['django']

services:
Expand Down Expand Up @@ -43,7 +43,6 @@ jobs:
run: |
pip install --upgrade pip
pip install -e .[testing]
reentry scan -r aiida
- name: Run test suite
env:
Expand All @@ -57,33 +56,13 @@ jobs:
timeout-minutes: 15
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9
- name: Install python dependencies
run: |
pip install --upgrade pip
pip install -e .[docs]
reentry scan -r aiida
- name: Build docs
run: cd docs && make

pre-commit:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install python dependencies
run: |
pip install --upgrade pip
pip install -e .[pre-commit,docs,testing]
reentry scan -r aiida
- name: Run pre-commit
run: |
pre-commit install
pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
4 changes: 2 additions & 2 deletions .github/workflows/publish-on-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Python 3.8
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.9

- name: Upgrade setuptools and install package
run: |
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

python:
version: 3.8
version: 3.9
install:
- method: pip
path: .
Expand Down
66 changes: 66 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,69 @@
[build-system]
requires = ["flit_core >=3.2,<4"]
build-backend = "flit_core.buildapi"

[tool.flit.module]
name = "aiida_flexpart"

[project]
name = "aiida-flexpart"
version = "0.1.0a0"
readme = "README.md"
license = {file = 'LICENSE'}
description = "AiiDA plugin for the FLEXPART code (simulation of atmospheric transport processes)."
classifiers = [
"Intended Audience :: Science/Research",
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
"Framework :: AiiDA",
"Development Status :: 3 - Alpha",
"Topic :: Scientific/Engineering :: Atmospheric Science",
"Programming Language :: Python :: 3",

]
requires-python = ">=3.9"
dependencies = [
"aiida-core>=1.6.5,<3.0.0",
"six",
"psycopg2-binary<2.9",
"voluptuous",
"jinja2",
]

[[project.authors]]
name = ""

[project.urls]
Homepage = "https://github.com/aiidaplugins/aiida-flexpart"

[project.optional-dependencies]
dev = [
"pgtest~=1.3.1",
"pytest~=6.0",
"pytest-cov",
"pre-commit~=2.2",
]

docs = [
"sphinx",
"sphinxcontrib-contentui",
"sphinxcontrib-details-directive",
"sphinx-rtd-theme",
]

[project.entry-points."aiida.calculations"]
"flexpart.cosmo" = "aiida_flexpart.calculations.flexpart_cosmo:FlexpartCosmoCalculation"
"flexpart.ifs" = "aiida_flexpart.calculations.flexpart_ifs:FlexpartIfsCalculation"
"flexpart.post" = "aiida_flexpart.calculations.flexpart_post:PostProcessingCalculation"

[project.entry-points."aiida.parsers"]
"flexpart.cosmo" = "aiida_flexpart.parsers.flexpart_cosmo:FlexpartCosmoParser"
"flexpart.ifs" = "aiida_flexpart.parsers.flexpart_ifs:FlexpartIfsParser"
"flexpart.post" = "aiida_flexpart.parsers.flexpart_post:FlexpartPostParser"

[project.entry-points."aiida.workflows"]
"flexpart.multi_dates" = "aiida_flexpart.workflows.multi_dates_workflow:FlexpartMultipleDatesWorkflow"

[tool.pylint.format]
max-line-length = 125

Expand Down
60 changes: 0 additions & 60 deletions setup.json

This file was deleted.

19 changes: 0 additions & 19 deletions setup.py

This file was deleted.

0 comments on commit 7d763e1

Please sign in to comment.