diff options
| -rw-r--r-- | CONTRIBUTING.rst | 5 | ||||
| -rw-r--r-- | babel.cfg | 1 | ||||
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rwxr-xr-x | doc/source/conf.py | 11 | ||||
| -rw-r--r-- | doc/source/index.rst | 6 | ||||
| -rw-r--r-- | lower-constraints.txt | 5 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_utils.py | 2 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 8 | ||||
| -rw-r--r-- | setup.cfg | 14 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rwxr-xr-x | tools/test-setup.sh | 4 |
11 files changed, 26 insertions, 38 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 88a37f4..03ab07e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,3 +1,8 @@ +If you would like to contribute to the development of oslo's libraries, +first you must take a look to this page: + + https://specs.openstack.org/openstack/oslo-specs/specs/policy/contributing.html + ================= How to contribute ================= diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index efceab8..0000000 --- a/babel.cfg +++ /dev/null @@ -1 +0,0 @@ -[python: **.py] diff --git a/doc/requirements.txt b/doc/requirements.txt index e0781e8..39130db 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,8 +1,8 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -openstackdocstheme>=1.20.0 # Apache-2.0 -sphinx>=1.8.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD doc8>=0.6.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index afa698b..9b867dc 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -23,15 +23,14 @@ extensions = [ 'stevedore.sphinxext' ] # openstackdocstheme options -repository_name = 'openstack/oslo.db' -bug_project = 'oslo.db' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.db' +openstackdocs_bug_project = 'oslo.db' +openstackdocs_bug_tag = '' # The master toctree document. master_doc = 'index' # General information about the project. -project = u'oslo.db' copyright = u'2014, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. @@ -42,19 +41,17 @@ add_function_parentheses = True add_module_names = True # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['oslo_db.'] - # -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. html_theme = 'openstackdocs' - # -- sphinxcontrib.apidoc configuration -------------------------------------- apidoc_module_dir = '../../oslo_db' diff --git a/doc/source/index.rst b/doc/source/index.rst index 3876cdd..2ba451b 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -14,6 +14,12 @@ utils. user/index reference/index +Release Notes +============= + +Read also the `oslo.db Release Notes +<https://docs.openstack.org/releasenotes/oslo.db/>`_. + Indices and tables ================== diff --git a/lower-constraints.txt b/lower-constraints.txt index fd85d4b..15dcf98 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -11,18 +11,15 @@ decorator==3.4.0 eventlet==0.18.2 extras==1.0.0 fixtures==3.0.0 -flake8==2.5.5 future==0.16.0 gitdb==0.6.4 GitPython==1.0.1 greenlet==0.4.10 -hacking==0.12.0 iso8601==0.1.11 keystoneauth1==3.4.0 linecache2==1.0.0 Mako==0.4.0 MarkupSafe==1.0 -mccabe==0.2.1 monotonic==0.6 netaddr==0.7.18 netifaces==0.10.4 @@ -33,12 +30,10 @@ oslo.i18n==3.15.3 oslo.utils==3.33.0 oslotest==3.2.0 pbr==2.0.0 -pep8==1.5.7 pifpaf==0.10.0 prettytable==0.7.2 psycopg2==2.7.0 pycparser==2.18 -pyflakes==0.8.1 PyMySQL==0.7.6 pyparsing==2.1.0 pyperclip==1.5.27 diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py index e6174a7..50f4af1 100644 --- a/oslo_db/tests/sqlalchemy/test_utils.py +++ b/oslo_db/tests/sqlalchemy/test_utils.py @@ -905,7 +905,7 @@ class TestMigrationUtils(db_test_base._DbTestCase): table_name = 'abc' table = Table(table_name, self.meta, Column('id', Integer, primary_key=True), - Column('deleted', Boolean)) + Column('deleted', Boolean(create_constraint=True))) ck = [ const for const in table.constraints if isinstance(const, CheckConstraint)][0] diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index bb7b35b..efef05f 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -42,9 +42,9 @@ extensions = [ 'reno.sphinxext', ] # openstackdocstheme options -repository_name = 'openstack/oslo.db' -bug_project = 'oslo.db' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.db' +openstackdocs_bug_project = 'oslo.db' +openstackdocs_bug_tag = '' # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -91,7 +91,7 @@ exclude_patterns = [] # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -41,17 +41,3 @@ oslo.config.opts = oslo.db.migration = alembic = oslo_db.sqlalchemy.migration_cli.ext_alembic:AlembicExtension migrate = oslo_db.sqlalchemy.migration_cli.ext_migrate:MigrateExtension - -[compile_catalog] -directory = oslo_db/locale -domain = oslo_db - -[update_catalog] -domain = oslo_db -output_dir = oslo_db/locale -input_file = oslo_db/locale/oslo_db.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = oslo_db/locale/oslo_db.pot diff --git a/test-requirements.txt b/test-requirements.txt index 11dc2f3..d55902a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=3.0,<3.1.0 # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 07a0785..505a58c 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e " DELETE FROM mysql.user WHERE User=''; FLUSH PRIVILEGES; - GRANT ALL PRIVILEGES ON *.* - TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;" + CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW'; + GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;" # Now create our database. mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e " |