Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
db366f6
Add workflows - will fail.
andrewtarzia May 8, 2025
04bac1e
Bring in modern tooling (uv, pyproject.toml, justfile).
andrewtarzia May 8, 2025
7079648
Update to name pywindowx - although this may need to change to pywind…
andrewtarzia May 8, 2025
83f71c6
Update min python version.
andrewtarzia May 20, 2025
40a9bfe
Use ubuntu latest.
andrewtarzia May 20, 2025
9b966e9
Merge pull request #8 from andrewtarzia/tooling_1
andrewtarzia May 20, 2025
39ff8d3
Update env for docs.
andrewtarzia May 20, 2025
ef91593
Delete unused docs, setup and write cleaner docs - will fail until re…
andrewtarzia May 20, 2025
0951395
Merge pull request #9 from andrewtarzia/tooling_2
marcinmiklitz Jun 7, 2025
35da100
Move to internal, has issues.
andrewtarzia Jun 7, 2025
1592960
Run ruff fix on save on all.
andrewtarzia Jun 7, 2025
9d5bd4d
Update import statements internally.
andrewtarzia Jun 7, 2025
3417cb3
Add periodic table.
andrewtarzia Jun 7, 2025
6614b3a
Add utility for examples (implemented later).
andrewtarzia Jun 7, 2025
320e922
Remove doc page.
andrewtarzia Jun 7, 2025
9d81e75
Remove autosummary docs until docs work.
andrewtarzia Jun 7, 2025
0da779f
Add os import (temporary).
andrewtarzia Jun 7, 2025
7814629
Code 1: moving to _internal and setting the interface (still broken)
marcinmiklitz Jun 7, 2025
5145cd1
Rename tests to standard for pytest.
andrewtarzia Jun 7, 2025
8f8fa5d
Ruff fix.
andrewtarzia Jun 7, 2025
6358d17
Ruff fix.
andrewtarzia Jun 7, 2025
4040964
Update tests to handle new interface.
andrewtarzia Jun 7, 2025
f04ac7c
Add example scripts - will not run currently.
andrewtarzia Jun 7, 2025
2823a00
Add a shortened HISTORY file to make example less expensive.
andrewtarzia Jun 7, 2025
f275954
Bringing in examples and tests based on new interface.
marcinmiklitz Jun 8, 2025
40a0b4f
Code 2: Fix the error with Python >=3.9. Handle ruff and mypy (#12)
andrewtarzia Jul 28, 2025
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
20 changes: 20 additions & 0 deletions .github/workflows/publish_release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Publish release
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+.[0-9]+"
jobs:
publish-release:
runs-on: ubuntu-latest
env:
VERSION: ${{ github.ref_name }}
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v5
with:
enable-cache: true
- uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
- run: uv build
- run: uv publish -u __token__ -p ${{ secrets.PYPI_API_TOKEN }}
68 changes: 68 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Tests
on:
push:
branches:
- master
pull_request:
workflow_dispatch:
jobs:
ruff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
- run: uv sync --all-extras --dev
- run: uv run ruff check src/ tests/ docs/source/ examples/
mypy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
- run: uv sync --all-extras --dev
- run: uv run mypy src/ tests/ docs/source/ examples/
ruff-format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
- run: uv sync --all-extras --dev
- run: uv run ruff format --check src/ tests/ docs/source/ examples/
pytest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
- run: uv sync --all-extras --dev
- run: uv run pytest
doctest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- uses: actions/setup-python@v5
with:
python-version-file: "pyproject.toml"
- run: uv sync --all-extras --dev
- run: uv run make -C docs doctest
11 changes: 4 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Marcin add-ons
TEST.ipynb
tests/
pywindow/shape.py
pywindow/graph.py
pywindow/postprocess.py

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -94,3 +87,7 @@ ENV/

# Rope project settings
.ropeproject

.pytest_cache
.ruff_cache
.venv
16 changes: 16 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2

build:
os: ubuntu-lts-latest
tools:
python: "3.11"

sphinx:
configuration: docs/source/conf.py

python:
install:
- method: pip
path: .
extra_requirements:
- dev
35 changes: 0 additions & 35 deletions README.md

This file was deleted.

45 changes: 45 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
:maintainers:
`marcinmiklitz <https://github.com/marcinmiklitz/>`_
`andrewtarzia <https://github.com/andrewtarzia/>`_
:documentation: https://pywindowx.readthedocs.io/en/latest/

.. figure:: docs/source/_static/pyWINDOW_logo.png

Overview
========

``pywindow`` is a Python package for the analysis of structural properties of
molecular pores (*porous organic cages*, but also *MOFs* and
*metal-organic cages* - see examples directory).

.. warning::
This package is currently under development and differs
from the published
`pywindow <https://github.com/andrewtarzia/pywindow>`_ but
should work with Python >= 3.9.

Installation
============

``pywindow`` can be installed with pip:

.. code-block:: bash

pip install pywindowx

Developer Setup
---------------

To develop with ``pywindow``, you can clone the repo and use
`just <https://github.com/casey/just>`_ to setup the dev environment:

.. code-block:: bash

just setup

How To Cite
===========

If you use ``pywindow`` please cite

https://pubs.acs.org/doi/10.1021/acs.jcim.8b00490
2 changes: 0 additions & 2 deletions bld.bat

This file was deleted.

1 change: 0 additions & 1 deletion build.sh

This file was deleted.

4 changes: 0 additions & 4 deletions docs/.buildinfo

This file was deleted.

12 changes: 6 additions & 6 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SPHINXPROJ = pywindow
SOURCEDIR = ./source/
BUILDDIR = ..
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?= -W --keep-going
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = build

# Put it first so that "make" without argument is like "make help".
help:
Expand Down
Loading
Loading