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

feat: scm versioning #10

Merged
merged 5 commits into from
Jan 16, 2023
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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Carlos da Costa
Copyright (c) 2020-2023 Carlos da Costa

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion cpp/fdct2d_wrapper.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* fdct2d_wrapper (Pybind11 wrapper for Fast 2D Curvelet Wrapping Transform)
Copyright (C) 2020 Carlos Alberto da Costa Filho
Copyright (C) 2020-2023 Carlos Alberto da Costa Filho

${CXX} -O3 -Wall -shared -std=c++11 -fPIC \
-I${FFTW}/fftw `python3 -m pybind11 --includes` \
Expand Down
2 changes: 1 addition & 1 deletion cpp/fdct3d_wrapper.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* fdct3d_wrapper (Pybind11 wrapper for Fast 3D Curvelet Wrapping Transform)
Copyright (C) 2020 Carlos Alberto da Costa Filho
Copyright (C) 2020-2023 Carlos Alberto da Costa Filho

${CXX} -O3 -Wall -shared -std=c++11 -fPIC \
-I${FFTW}/fftw `python3 -m pybind11 --includes` \
Expand Down
8 changes: 8 additions & 0 deletions curvelops/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
from .curvelops import *


try:
from ._version import __version__
except ImportError:
from datetime import datetime

__version__ = "0.0.unknown+" + datetime.today().strftime("%Y%m%d")
3 changes: 0 additions & 3 deletions curvelops/curvelops.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
Provides a LinearOperator for the 2D and 3D curvelet transforms.
"""

__version__ = "0.21"
__author__ = "Carlos Alberto da Costa Filho"

from itertools import product
from typing import List, Optional, Tuple, Callable, Union, Sequence
import numpy as np
Expand Down
10 changes: 4 additions & 6 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@
# import sys
# sys.path.insert(0, os.path.abspath('.'))

from curvelops import __version__ as version

release = version

# -- Project information -----------------------------------------------------

project = "curvelops"
copyright = "2020, Carlos Alberto da Costa Filho"
copyright = "2020-2023, Carlos Alberto da Costa Filho"
author = "Carlos Alberto da Costa Filho"

# The short X.Y version
version = ""
# The full version, including alpha/beta/rc tags
release = "0.21"


# -- General configuration ---------------------------------------------------

Expand Down
8 changes: 5 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
from pybind11.setup_helpers import Pybind11Extension, build_ext

NAME = "curvelops"
VERSION = "0.21"
AUTHOR = "Carlos Alberto da Costa Filho"
AUTHOR_EMAIL = "c.dacostaf@gmail.com"
URL = "https://github.com/pylops/curvelops"
URL = "https://github.com/PyLops/curvelops"
DESCRIPTION = "Python wrapper for CurveLab's 2D and 3D curvelet transforms"
LICENSE = "MIT"

Expand Down Expand Up @@ -104,7 +103,6 @@

setup(
name=NAME,
version=VERSION,
author=AUTHOR,
author_email=AUTHOR_EMAIL,
url=URL,
Expand All @@ -125,7 +123,11 @@
setup_requires=[
"pybind11>=2.6.0; python_version < '3.10'",
"pybind11>=2.10.0; python_version >= '3.11'",
"setuptools_scm",
],
use_scm_version=dict(
root=".", relative_to=__file__, write_to=f"{NAME}/_version.py"
),
license=LICENSE,
test_suite="pytests",
tests_require=["pytest"],
Expand Down