Skip to content

Commit

Permalink
refactor: renaming famapy by flamapy
Browse files Browse the repository at this point in the history
  • Loading branch information
Virako committed Aug 4, 2022
1 parent bcd8cea commit 1a3d077
Show file tree
Hide file tree
Showing 23 changed files with 65 additions and 68 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install famapy-fm
pip install flamapy-fm
pip install prospector[with_everything]==1.7.7
pip install .
- name: Analysing the code with prospector
Expand All @@ -35,7 +35,7 @@ jobs:
pip install .
- name: Running static types with mypy
run: |
mypy famapy
mypy flamapy
pytest:
runs-on: ubuntu-latest
steps:
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install famapy-fm
pip install flamapy-fm
pip install .
pip install pytest==5.4.3
- name: Running test
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@ lint:

mypy:
echo "To lint this project, make sure that you have installed the core" >&2;
mypy famapy
mypy flamapy

test:
python -m pytest -sv

cov:
coverage run --source=famapy -m pytest
coverage run --source=flamapy -m pytest
coverage report
coverage html



Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from pysat.formula import CNF

from famapy.core.models import VariabilityModel
from flamapy.core.models import VariabilityModel


class PySATModel(VariabilityModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from famapy.core.operations import Commonality
from famapy.core.models import VariabilityModel
from famapy.metamodels.configuration_metamodel.models.configuration import Configuration
from famapy.metamodels.pysat_metamodel.operations.glucose3_products import Glucose3Products
from flamapy.core.operations import Commonality
from flamapy.core.models import VariabilityModel
from flamapy.metamodels.configuration_metamodel.models.configuration import Configuration
from flamapy.metamodels.pysat_metamodel.operations.glucose3_products import Glucose3Products


class Glucose3Commonality(Commonality):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from pysat.solvers import Glucose3

from famapy.core.operations import CoreFeatures
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.core.operations import CoreFeatures
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3CoreFeatures(CoreFeatures):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from pysat.solvers import Glucose3

from famapy.core.operations import DeadFeatures
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.core.operations import DeadFeatures
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3DeadFeatures(DeadFeatures):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#from pysat.solvers import Glucose3

from famapy.core.operations import ErrorDetection
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from famapy.metamodels.pysat_metamodel.operations.glucose3_dead_features import (
from flamapy.core.operations import ErrorDetection
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.operations.glucose3_dead_features import (
Glucose3DeadFeatures
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_false_optional_features import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_false_optional_features import (
Glucose3FalseOptionalFeatures
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_valid import Glucose3Valid
from famapy.metamodels.fm_metamodel.models.feature_model import FeatureModel
from flamapy.metamodels.pysat_metamodel.operations.glucose3_valid import Glucose3Valid
from flamapy.metamodels.fm_metamodel.models.feature_model import FeatureModel


class Glucose3ErrorDetection(ErrorDetection):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from pysat.solvers import Glucose3

from famapy.core.operations import FalseOptionalFeatures
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from famapy.metamodels.fm_metamodel.models.feature_model import FeatureModel
from flamapy.core.operations import FalseOptionalFeatures
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.fm_metamodel.models.feature_model import FeatureModel


class Glucose3FalseOptionalFeatures(FalseOptionalFeatures):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from pysat.solvers import Glucose3

from famapy.metamodels.configuration_metamodel.models.configuration import Configuration
from famapy.core.operations import Filter
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.configuration_metamodel.models.configuration import Configuration
from flamapy.core.operations import Filter
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3Filter(Filter):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from pysat.solvers import Glucose3

from famapy.core.operations import Products
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.core.operations import Products
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3Products(Products):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pysat.solvers import Glucose3

from famapy.core.operations import ProductsNumber
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.core.operations import ProductsNumber
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3ProductsNumber(ProductsNumber):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from pysat.solvers import Glucose3

from famapy.core.operations import Valid
from flamapy.core.operations import Valid

from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3Valid(Valid):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from pysat.solvers import Glucose3

from famapy.core.operations import ValidConfiguration
from famapy.metamodels.configuration_metamodel.models.configuration import Configuration
from flamapy.core.operations import ValidConfiguration
from flamapy.metamodels.configuration_metamodel.models.configuration import Configuration


from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3ValidConfiguration(ValidConfiguration):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from pysat.solvers import Glucose3

from famapy.core.operations import ValidProduct
from famapy.metamodels.configuration_metamodel.models.configuration import Configuration
from flamapy.core.operations import ValidProduct
from flamapy.metamodels.configuration_metamodel.models.configuration import Configuration

from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class Glucose3ValidProduct(ValidProduct):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from famapy.core.transformations import TextToModel
from flamapy.core.transformations import TextToModel

from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from famapy.metamodels.pysat_metamodel.models.txtcnf_model import (
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.models.txtcnf_model import (
TextCNFModel,
TextCNFNotation,
CNFLogicConnective
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import itertools
from typing import Any

from famapy.core.transformations import ModelToModel
from famapy.metamodels.fm_metamodel.models.feature_model import (
from flamapy.core.transformations import ModelToModel
from flamapy.metamodels.fm_metamodel.models.feature_model import (
FeatureModel,
Constraint,
Feature,
Relation,
)
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel


class FmToPysat(ModelToModel):
Expand Down
20 changes: 10 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@


setuptools.setup(
name="famapy-sat",
version="1.0.0",
author="Víctor Ramírez de la Corte",
author_email="me@virako.es",
description="famapy-sat is a plugin to FaMaPy module",
name="flamapy-sat",
version="1.0.0.dev0",
author="Flamapy",
author_email="flamapy@us.es",
description="flamapy-sat is a plugin to flamapy module",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/FaMaPy/pysat_metamodel",
packages=setuptools.find_namespace_packages(include=['famapy.*']),
url="https://github.com/flamapy/pysat_metamodel",
packages=setuptools.find_namespace_packages(include=['flamapy.*']),
classifiers=[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"Operating System :: OS Independent",
],
python_requires='>=3.9',
install_requires=[
'famapy~=1.0.0',
'famapy-fm~=1.0.0',
'flamapy~=1.0.0.dev0',
'flamapy-fm~=1.0.0.dev0',
'python-sat>=0.1.7.dev6'
],
extras_require={
Expand All @@ -36,6 +36,6 @@
]
},
dependency_links=[
'famapy~=1.0.0'
'flamapy~=1.0.0.dev0'
]
)
22 changes: 11 additions & 11 deletions tests/operations/operations_test.py
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@

from famapy.metamodels.configuration_metamodel.models import Configuration
from famapy.metamodels.fm_metamodel.models import Feature
from famapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from famapy.metamodels.pysat_metamodel.operations.glucose3_core_features import (
from flamapy.metamodels.configuration_metamodel.models import Configuration
from flamapy.metamodels.fm_metamodel.models import Feature
from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
from flamapy.metamodels.pysat_metamodel.operations.glucose3_core_features import (
Glucose3CoreFeatures,
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_dead_features import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_dead_features import (
Glucose3DeadFeatures,
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_error_detection import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_error_detection import (
Glucose3ErrorDetection,
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_false_optional_features import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_false_optional_features import (
Glucose3FalseOptionalFeatures,
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_products import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_products import (
Glucose3Products,
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_products_number import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_products_number import (
Glucose3ProductsNumber,
)
from famapy.metamodels.pysat_metamodel.operations.glucose3_valid import Glucose3Valid
from famapy.metamodels.pysat_metamodel.operations.glucose3_valid_product import (
from flamapy.metamodels.pysat_metamodel.operations.glucose3_valid import Glucose3Valid
from flamapy.metamodels.pysat_metamodel.operations.glucose3_valid_product import (
Glucose3ValidProduct,
)

Expand Down

0 comments on commit 1a3d077

Please sign in to comment.