Skip to content

Commit 05c1993

Browse files
committed
Merge branch 'master' into fix-var-projection
2 parents cfe1f6c + d21a949 commit 05c1993

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

.github/workflows/deploy_after_tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ jobs:
6262
python-version: ${{ matrix.python-version }}
6363
- name: Install build
6464
run: |
65-
pip install --upgrade pip
66-
pip install build
65+
pip install --upgrade pip build
6766
- name: Build a binary wheel and a source tarball
6867
run: |
6968
python -m build --sdist --wheel --outdir dist/ .
69+
git status
7070
- name: Publish distribution to PyPI
7171
if: startsWith(github.ref, 'refs/tags')
7272
uses: pypa/gh-action-pypi-publish@release/v1

.gitignore

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@
33

44
# compiled python codes
55
*.pyc
6-
pydmd\.egg-info/**
6+
*egg-info/**
7+
dist/**
78

89
.idea/**
910

1011
**/\.ipynb_checkpoints/**
1112
**/SegTrackv2.zip
1213
**/SegTrackv2/**
1314
build/**
15+
dist/**
1416

1517
# Vscode
1618
.vscode/**
1719

18-
20+
# Virtual environment
21+
venv*/**
1922
.venv
20-
.python-version
23+
24+
# Pyenv
25+
.python-version

docs/source/conf.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414

1515
import sys
1616
import os
17+
import datetime
1718
import shlex
1819
import sphinx
1920
from sphinx.errors import VersionRequirementError
2021
import sphinx_rtd_theme
22+
import importlib.metadata
23+
2124

2225
# If extensions (or modules to document with autodoc) are in another directory,
2326
# add these directories to sys.path here. If the directory is relative to the
@@ -26,6 +29,7 @@
2629
import pydmd
2730

2831
# -- General configuration ------------------------------------------------
32+
_DISTRIBUTION_METADATA = importlib.metadata.metadata('PyDMD')
2933

3034
# If your documentation needs a minimal Sphinx version, state it here.
3135
needs_sphinx = "1.4"
@@ -74,8 +78,9 @@
7478

7579
# General information about the project.
7680
project = "PyDMD"
77-
copyright = pydmd.__copyright__
78-
author = pydmd.__author__
81+
current_year = datetime.datetime.now().year
82+
copyright = f"2017-{current_year}, PyDMD Contributors"
83+
author = _DISTRIBUTION_METADATA['Author']
7984

8085
# autoclass
8186
autoclass_content = "both"
@@ -85,7 +90,7 @@
8590
# built documents.
8691
#
8792
# The short X.Y version.
88-
version = pydmd.__version__
93+
version = _DISTRIBUTION_METADATA['Version']
8994
# The full version, including alpha/beta/rc tags.
9095
release = version
9196

@@ -311,7 +316,6 @@
311316
"pydmd Documentation",
312317
author,
313318
"pydmd",
314-
"One line description of project.",
315319
"Miscellaneous",
316320
),
317321
]

0 commit comments

Comments
 (0)