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

Fix simplesat build #287

Merged
merged 13 commits into from
Sep 6, 2024
Merged
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 .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
branch = True
source = simplesat
relative_files = True
data_file = coverage

[report]
omit = *test*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
run-tests:
strategy:
matrix:
runtime: [3.8, 3.11, pypy3.8]
runtime: [3.8, '3.11', pypy3.8]
os: [ubuntu-latest, macos-12, macos-latest, windows-latest]
include:
- os: ubuntu-20.04
Expand All @@ -35,7 +35,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: coverage-${{matrix.os}}-${{matrix.runtime}}
path: .coverage.*
path: coverage.*
build-docs:
runs-on: ubuntu-latest
needs: run-tests
Expand Down
4 changes: 3 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include setup_utils.py
include VERSION
include *.txt
recursive-include docs
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.9.1.dev
4 changes: 1 addition & 3 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ PyYAML
Jinja2
coverage
haas>=0.6
mock>=1.1
tox>=2.0.0
unittest2>=1.0.1
mock
2 changes: 0 additions & 2 deletions requirements.txt

This file was deleted.

41 changes: 41 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[metadata]
name = simplesat
version = file: VERSION
url = https://github.com/enthought/sat-solver
author = Enthought Inc.
author_email = [email protected]
description = Prototype for SAT-based dependency handling. This is a work in progress, do not expect any API not to change at this point.
long_description = file: README.rst, CHANGES.rst
long_description_content_type = text/x-rst
license = BSD-3-Clause
license_files = file: LICENSE.txt
classifier =
Programming Language :: Python :: 3
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11

[options]
zip_safe = False
packages =
simplesat
simplesat.constraints
simplesat.constraints.tests
simplesat.examples
simplesat.sat
simplesat.sat.policy
simplesat.sat.tests
simplesat.tests
simplesat.test_data
simplesat.utils
simplesat.utils.tests
python_requires = >=3.6
install_requires =
attrs >= 17.4.0
okonomiyaki >= 0.16.6
six >= 1.10.0

[options.package_data]
simplesat.tests = *.yaml
simplesat.test_data = indices/*.json
68 changes: 5 additions & 63 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,66 +1,8 @@
import os.path

from pathlib import Path
from setuptools import setup

from setup_utils import parse_version, write_version_py


MAJOR = 0
MINOR = 9
MICRO = 0

IS_RELEASED = True
POST_RELEASE = None


INSTALL_REQUIRES = [
"attrs >= 17.4.0",
"okonomiyaki >= 0.16.6",
"six >= 1.10.0"
]

EXTRAS_REQUIRE = {
':python_version=="2.7"': [
'enum34',
],
}

PACKAGES = [
"simplesat",
"simplesat.constraints",
"simplesat.constraints.tests",
"simplesat.examples",
"simplesat.sat",
"simplesat.sat.policy",
"simplesat.sat.tests",
"simplesat.tests",
"simplesat.test_data",
"simplesat.utils",
"simplesat.utils.tests",
]

PACKAGE_DATA = {
"simplesat.tests": ["*.yaml"],
"simplesat.test_data": ["indices/*.json"],
}


if __name__ == "__main__":
version_file = os.path.join("simplesat", "_version.py")
write_version_py(
version_file, MAJOR, MINOR, MICRO, IS_RELEASED, post_release=POST_RELEASE
)
version = parse_version(version_file)
HERE = Path(__file__).parent
version = (HERE / 'VERSION').read_text().strip()
filename = (HERE / 'simplesat' / '_version.py').write_text(f'__version__ = "{version}"\n')

setup(
name='simplesat',
version=version,
author='Enthought, Inc',
author_email='[email protected]',
url='https://github.com/enthought/sat-solvers',
description='Simple SAT solvers for use in Enstaller',
packages=PACKAGES,
package_data=PACKAGE_DATA,
install_requires=INSTALL_REQUIRES,
extras_require=EXTRAS_REQUIRE,
)
setup()
151 changes: 0 additions & 151 deletions setup_utils.py

This file was deleted.

15 changes: 3 additions & 12 deletions simplesat/__init__.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
from __future__ import absolute_import

from .constraints import Requirement, InstallRequirement
from .package import PackageMetadata, RepositoryPackageMetadata, RepositoryInfo
from .pool import Pool
from .repository import Repository
from .request import JobType, Request

try: # pragma: no cover
from ._version import (
version as __version__, version_info as __version_info__,
is_released as __is_released__, git_revision as __git_revision__,
)
from ._version import __version__
except ImportError: # pragma: no cover
__is_released__ = False
__version__ = __git_revision__ = "unknown"
__version_info__ = (0, 0, 0, "unknown", 0)
__version__ = "unknown"


__all__ = [
Expand All @@ -27,6 +20,4 @@
'Repository',
'JobType',
'Request',
'__is_released__',
'__version__',
'__version_info__']
'__version__']
14 changes: 0 additions & 14 deletions tox.ini

This file was deleted.

Loading