Skip to content
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.

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

Dev #28

Merged
merged 5 commits into from
Oct 19, 2024
Merged

Dev #28

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 docs/DOCS_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.1.0
10 changes: 8 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# Configuration file for the Sphinx documentation builder.
import pathlib

# -- Project information

with open("DOCS_VERSION", 'r') as f:
version = f.read().strip()

release = version

project = 'torchflows'
copyright = '2024, David Nabergoj'
author = 'David Nabergoj'

release = '1.0'
version = '1.0.6'
# release = f'{torchflows.__version__}'
# version = f'{torchflows.__version__}'

# -- General configuration

Expand Down
8 changes: 4 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
#
# For the full list of built-in configuration values, see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html
import pathlib

# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
import pathlib
import sys

sys.path.insert(0, pathlib.Path(__file__).parents[2].resolve().as_posix())
with open("../DOCS_VERSION", 'r') as f:
version = f.read().strip()

project = 'Torchflows'
copyright = '2024, David Nabergoj'
author = 'David Nabergoj'
release = '1.0.2'
release = f'{version}'

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "torchflows"
version = "1.0.6"
dynamic = ["version"]
authors = [
{ name = "David Nabergoj", email = "[email protected]" },
]
Expand Down
21 changes: 15 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
from setuptools import setup, find_packages
from distutils.util import convert_path
import pathlib
import sys

here = pathlib.Path(__file__).parent.resolve()

long_description = (here / "README.md").read_text(encoding="utf-8")
root = pathlib.Path(__file__).parent.resolve()
sys.path.append(root.as_posix())

main_ns = {}
ver_path = convert_path('torchflows/_version.py')
with open(ver_path) as ver_file:
exec(ver_file.read(), main_ns)

long_description = (root / "README.md").read_text(encoding="utf-8")

setup(
name="normalizing-flows",
version="1.0.4",
name="Torchflows",
version=main_ns['__version__'],
description="Modern normalizing flows in Python",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/davidnabergoj/normalizing-flows",
url="https://github.com/davidnabergoj/torchflows",
author="David Nabergoj",
author_email="[email protected]",
classifiers=[ # Optional
Expand Down Expand Up @@ -43,6 +52,6 @@
"tqdm"
],
project_urls={
"Bug Reports": "https://github.com/davidnabergoj/normalizing-flows/issues",
"Bug Reports": "https://github.com/davidnabergoj/torchflows/issues",
},
)
4 changes: 3 additions & 1 deletion torchflows/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
from torchflows.bijections.continuous.ffjord import FFJORD
from torchflows.bijections.continuous.ddnf import DeepDiffeomorphicBijection
from torchflows.bijections.continuous.otflow import OTFlow
from torchflows._version import __version__

__all__ = [
'NICE',
Expand All @@ -46,10 +47,11 @@
'ProximalResFlow',
'Radial',
'Planar',
'InverseSylvester',
'Sylvester',
'ElementwiseShift',
'ElementwiseAffine',
'ElementwiseRQSpline',
'Flow',
'FlowMixture',
'__version__'
]
1 change: 1 addition & 0 deletions torchflows/_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "v1.1.0"
Loading