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

Add tag-based versioning for git archive support #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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 .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref-names: $Format:%D$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git_archival.txt export-subst
2 changes: 1 addition & 1 deletion proxmin/nmf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def step_pgm(*X, it=None, W=1):
step_A, step_S
"""
A, S = X
if W is 1:
if W == 1:
return step_A(A, S), step_S(A, S)
else:
C, K = A.shape
Expand Down
14 changes: 5 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
from setuptools import setup
from setuptools import setup, find_packages
import os

packages = []
for root, dirs, files in os.walk('.'):
if not root.startswith('./build') and '__init__.py' in files:
packages.append(root[2:])

long_description = open('README.md').read()

setup(
name = 'proxmin',
description = 'Proximal methods for constrained optimization',
long_description = long_description,
long_description_content_type='text/markdown',
packages = packages,
packages=find_packages(),
include_package_data=False,
version = '0.6.9',
use_scm_version=True,
license='MIT',
author = 'Peter Melchior, Fred Moolekamp',
author_email = 'peter.m.melchior@gmail.com',
Expand All @@ -30,5 +25,6 @@
"Topic :: Scientific/Engineering :: Information Analysis"
],
keywords = ['optimization', 'constrained optimization', 'proximal algorithms', 'data analysis', 'non-negative matrix factorization'],
requires=['numpy','scipy']
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
install_requires=['numpy','scipy'],
)