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

Packaging improvements #14

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Packaging improvements #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e3a4b7
fix: remove deprecated test command from setup.py
jmahlik Oct 10, 2024
72e94f3
test: add tests for python 3.10-3.12
jmahlik Oct 10, 2024
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 .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
29 changes: 6 additions & 23 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#!/usr/bin/env python

import os
import sys

from setuptools import find_packages, setup, Command
from setuptools.command.test import test as TestCommand


long_description = '''
**RoPWR** is a library written in Python implementing several mathematical
Expand All @@ -31,20 +28,6 @@ def run(self):
os.system('rm -vrf ./build ./dist ./*.pyc ./*.tgz ./*.egg-info')


# test suites
class PyTest(TestCommand):
def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = []
self.test_suite = []

def run_tests(self):
# import here, because outside the eggs aren't loaded
import pytest
errcode = pytest.main(self.test_args)
sys.exit(errcode)


# install requirements
install_requires = [
'cvxpy>=1.1.14',
Expand All @@ -54,10 +37,10 @@ def run_tests(self):
]

# test requirements
tests_require = [
'pytest',
'coverage'
]
extras_require = {
'test': ['pytest', 'coverage'],
'ecos': ['ecos'],
}


# Read version file
Expand All @@ -78,10 +61,10 @@ def run_tests(self):
include_package_data=True,
license="Apache Licence 2.0",
url="https://github.com/guillermo-navas-palencia/ropwr",
cmdclass={'clean': CleanCommand, 'test': PyTest},
cmdclass={'clean': CleanCommand},
python_requires='>=3.7',
install_requires=install_requires,
tests_require=tests_require,
extras_require=extras_require,
classifiers=[
'Topic :: Scientific/Engineering :: Mathematics',
'Topic :: Software Development :: Libraries',
Expand Down
Loading