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.

Sign up for GitHub

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

Jump to bottom

Fix package to work with new pypi.org #42

Merged
merged 4 commits into from
Oct 31, 2018
Merged

Fix package to work with new pypi.org #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6ea8c0
Fix package to work with new pypi.org
saxbophone Oct 31, 2018
8bcbe39
Remove now-redundant build dependencies and add release make target
saxbophone Oct 31, 2018
b0536a5
Whoops! I forgot to remove (and lint) some code!
saxbophone Oct 31, 2018
c8b626b
Replace pesky double-quotes with single ones
saxbophone Oct 31, 2018
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
Next Next commit
Fix package to work with new pypi.org 
Wow! That was quicker than expected!
  • Loading branch information
@saxbophone
saxbophone committed Oct 31, 2018
commit f6ea8c0bb6a55899d97370fdb82ffbb34165eb43
2 changes: 2 additions & 0 deletions basest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@


__all__ = ['core', 'encoders', 'exceptions']

name = 'basest'
19 changes: 12 additions & 7 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

import os

from pip.req import parse_requirements
from pypandoc import convert_text
from setuptools import find_packages, setup


Expand All @@ -28,6 +26,12 @@ def readme(filepath):
)


def parse_requirements(filepath):
""" load requirements from a pip requirements file """
lineiter = (line.strip() for line in open(filepath))
return [line for line in lineiter if line and not line.startswith("#")]


def retrieve_deps(filepath):
"""
Given a file path that points to a requirements file that pip can
Expand All @@ -41,11 +45,12 @@ def retrieve_deps(filepath):

setup(
name='basest',
version='0.7.0',
version='0.7.1',
description=(
'Converts symbols from any number base to any other number base'
),
long_description=readme('README.md'),
long_description=open(os.path.join(os.path.dirname(__file__), 'README.md')).read(),
long_description_content_type='text/markdown',
url='https://github.com/saxbophone/basest-python',
author='Joshua Saxby',
author_email='[email protected]',
Expand Down Expand Up @@ -73,10 +78,10 @@ def retrieve_deps(filepath):
],
keywords='number base encoder decoder conversion encoding decoding',
packages=find_packages(),
install_requires=retrieve_deps('python_requirements/base.txt'),
install_requires=parse_requirements('python_requirements/base.txt'),
extras_require={
'test': retrieve_deps('python_requirements/test.txt'),
'build': retrieve_deps('python_requirements/build.txt'),
'test': parse_requirements('python_requirements/test.txt'),
'build': parse_requirements('python_requirements/build.txt'),
},
package_data={
'': ['README.md', 'LICENSE'],
Expand Down