Skip to content

Commit 63bf6a5

Browse files
committed
Update package name, update setup.py.
1 parent f3e5b99 commit 63bf6a5

12 files changed

+15
-15
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ compilepy3:
115115
@echo
116116
@echo "==================== flake8 ===================="
117117
@echo
118-
. $(VIRTUALENV_DIR)/bin/activate; flake8 --config=lint-configs/python/.flake8 st2rbac_enterprise_backend_default/
118+
. $(VIRTUALENV_DIR)/bin/activate; flake8 --config=lint-configs/python/.flake8 st2rbac_enterprise_backend/
119119

120120
.PHONY: .pylint
121121
.pylint:
122122
@echo
123123
@echo "==================== pylint ===================="
124124
@echo
125-
. $(VIRTUALENV_DIR)/bin/activate; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models st2rbac_enterprise_backend_default/
125+
. $(VIRTUALENV_DIR)/bin/activate; pylint -j $(PYLINT_CONCURRENCY) -E --rcfile=./lint-configs/python/.pylintrc --load-plugins=pylint_plugins.api_models --load-plugins=pylint_plugins.db_models st2rbac_enterprise_backend/
126126

127127
.PHONY: .unit-tests
128128
.unit-tests:

requirements.txt

Whitespace-only changes.

setup.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525

2626
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
2727
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
28-
INIT_FILE = os.path.join(BASE_DIR, 'st2rbac_enterprise_backend_default', '__init__.py')
28+
INIT_FILE = os.path.join(BASE_DIR, 'st2rbac_enterprise_backend', '__init__.py')
2929

3030
version = parse_version_string(INIT_FILE)
3131
install_reqs, dep_links = fetch_requirements(REQUIREMENTS_FILE)
3232

3333
setup(
34-
name='st2-enterprise-rbac-backend-default',
34+
name='st2-enterprise-rbac-backend',
3535
version=version,
3636
description='Enterprise RBAC backend for StackStorm.',
3737
author='StackStorm, Inc.',
3838
author_email='[email protected]',
39-
url='https://github.com/StackStorm/st2-enterprise-rbac-backend-default',
39+
url='https://github.com/StackStorm/st2-enterprise-rbac-backend',
4040
license='Proprietary License',
4141
download_url=(
42-
'https://github.com/StackStorm/st2-enterprise-rbac-backend-default/tarball/master'
42+
'https://github.com/StackStorm/st2-enterprise-rbac-backend/tarball/master'
4343
),
4444
classifiers=[
4545
'License :: Other/Proprietary License'
@@ -52,15 +52,15 @@
5252
],
5353
platforms=['Any'],
5454
scripts=[],
55-
provides=['st2rbac_enterprise_backend_default'],
55+
provides=['st2rbac_enterprise_backend'],
5656
packages=find_packages(),
5757
include_package_data=True,
5858
install_requires=install_reqs,
5959
dependency_links=dep_links,
6060
test_suite='tests',
6161
entry_points={
6262
'st2rbac.backends.backend': [
63-
'enterprise = st2rbac_enterprise_backend_default.',
63+
'enterprise = st2rbac_enterprise_backend.backend.EnterpriseRBACBackend',
6464
],
6565
},
6666
zip_safe=False

st2rbac_enterprise_backend_default/backend.py st2rbac_enterprise_backend/backend.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
from st2common.rbac.backends.base import BaseRBACBackend
1717

18-
from st2rbac_enterprise_backend_default import resolvers
19-
from st2rbac_enterprise_backend_default.syncer import RBACRemoteGroupToRoleSyncer
18+
from st2rbac_enterprise_backend import resolvers
19+
from st2rbac_enterprise_backend.syncer import RBACRemoteGroupToRoleSyncer
2020

2121
__all__ = [
2222
'EnterpriseRBACBackend'

st2rbac_enterprise_backend_default/cmd/apply_rbac_definitions.py st2rbac_enterprise_backend/cmd/apply_rbac_definitions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
from st2common.script_setup import setup as common_setup
2424
from st2common.script_setup import teardown as common_teardown
2525

26-
from st2rbac_enterprise_backend_default.loader import RBACDefinitionsLoader
27-
from st2rbac_enterprise_backend_default.syncer import RBACDefinitionsDBSyncer
26+
from st2rbac_enterprise_backend.loader import RBACDefinitionsLoader
27+
from st2rbac_enterprise_backend.syncer import RBACDefinitionsDBSyncer
2828

2929
__all__ = [
3030
'main'

tests/unit/test_rbac_loader.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
from st2tests import config
2424
from st2tests.fixturesloader import get_fixtures_base_path
25-
from st2rbac_enterprise_backend_default.loader import RBACDefinitionsLoader
25+
from st2rbac_enterprise_backend.loader import RBACDefinitionsLoader
2626

2727
__all__ = [
2828
'RBACDefinitionsLoaderTestCase'

tests/unit/test_rbac_syncer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
from st2common.services.rbac import create_role
3131
from st2common.services.rbac import assign_role_to_user
3232
from st2common.services.rbac import create_group_to_role_map
33-
from st2rbac_enterprise_backend_default.syncer import RBACDefinitionsDBSyncer
34-
from st2rbac_enterprise_backend_default.syncer import RBACRemoteGroupToRoleSyncer
33+
from st2rbac_enterprise_backend.syncer import RBACDefinitionsDBSyncer
34+
from st2rbac_enterprise_backend.syncer import RBACRemoteGroupToRoleSyncer
3535

3636
__all__ = [
3737
'RBACDefinitionsDBSyncerTestCase',

0 commit comments

Comments
 (0)