Skip to content

Commit

Permalink
Merge branch '27-modernize-python-package-data-use-pyprojecttoml' int…
Browse files Browse the repository at this point in the history
…o develop
  • Loading branch information
Cali Garmo committed Mar 2, 2024
2 parents 4124253 + cb5628c commit e77b298
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 33 deletions.
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include README.md
include VERSION
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ Change to the root directory and run:
$ sage -pip install .
```

For convenience this package contains a makefile with this and other often used commands. This file neds updating to your sage installation directory before running.
For convenience this package contains a makefile with this and other often used commands.
The make file needs updating to your sage installation directory before running.

```
$ make install
Expand Down Expand Up @@ -60,6 +61,7 @@ $ make uninstall

## Documentation
To make the documentation, you can use `make`:
The make file needs updating to your sage installation directory before running.
```
$ make doc
```
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

27 changes: 27 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[project]
name = "oriented_matroids"
authors = [
{name = "Aram Dermenjian", email = "[email protected]"},
]
description = "Oriented matroids for sagemath"
keywords=["SageMath packaging"]
requires-python = ">=3.8"
license = {file = "LICENSE"}
# classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: Mathematics",
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
]
dependencies=["sage-package", "sphinx"]
version="0.1.1"

[project.readme]
file = "README.md"
content-type = "text/markdown"

[project.urls]
Homepage = "https://github.com/thecaligarmo/oriented_matroids"
"Bug Tracker" = "https://github.com/thecaligarmo/oriented_matroids/issues"
31 changes: 1 addition & 30 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
import os
import sys
from setuptools import setup, find_packages
from codecs import open # To open the README file with proper encoding
from setuptools.command.test import test as TestCommand # for tests


# Get information from separate files (README, VERSION)
def readfile(filename):
with open(filename, encoding='utf-8') as f:
return f.read()


# For the tests
class SageTest(TestCommand):
def run_tests(self):
Expand All @@ -20,29 +13,7 @@ def run_tests(self):


setup(
name="oriented_matroids",
description='Oriented matroids for sagemath',
version=readfile('VERSION').strip(),
long_description=readfile('README.md'),
long_description_content_type='text/markdown',
url='https://github.com/thecaligarmo/oriented_matroids',
author='Aram Dermenjian',
author_email='[email protected]',
project_urls={
'Bug Tracker': 'https://github.com/thecaligarmo/oriented_matroids/issues',
},
license='GPLv3+', # This should be consistent with the LICENCE file
python_requires='>=3.8',
# classifiers list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Science/Research',
'Topic :: Scientific/Engineering :: Mathematics',
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
],
keywords="SageMath packaging",
version='0.1.1',
packages=find_packages(),
cmdclass={'test': SageTest}, # adding a special setup command for tests
setup_requires=['sage-package'],
install_requires=['sage-package', 'sphinx'],
)

0 comments on commit e77b298

Please sign in to comment.