Skip to content

Commit 48fe339

Browse files
committed
Rename package to 'datameta'
1 parent 0e9f823 commit 48fe339

31 files changed

+37
-39
lines changed

.coveragerc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[run]
2-
source = sc2datahub
3-
omit = sc2datahub/test*
2+
source = datameta
3+
omit = datameta/test*

.github/workflows/testing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: |
2828
echo "/tmp/condaenv/bin" >> $GITHUB_PATH
2929
export PATH="/tmp/condaenv/bin:$PATH"
30-
- name: Install sc2datahub
30+
- name: Install datameta
3131
run: |
3232
pip install ".[testing]"
3333
- name: Initialize Database
@@ -36,6 +36,6 @@ jobs:
3636
alembic -c development.ini upgrade head
3737
- name: Load default data
3838
run: |
39-
initialize_sc2datahub_db development.ini
39+
initialize_datameta_db development.ini
4040
- name: Run tests
4141
run: pytest

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Data.fs*
2020
coverage
2121
test
2222
*.sqlite
23-
sc2datahub/alembic/versions/*.py
23+
datameta/alembic/versions/*.py

CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# SARS-CoV-2 Data Hub 0.9
1+
# DataMeta - submission server for data and affiliated metadata
22

33
- Initial version.

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
include *.txt *.ini *.cfg *.rst
2-
recursive-include sc2datahub *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
2+
recursive-include datameta *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2

README.md

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
SARS-CoV-2 Data Hub
2-
===================
1+
# DataMeta - submission server for data and affiliated metadata
32

4-
Getting Started
5-
---------------
3+
## Getting Started
64

75
- Change directory into your newly created project if not already there. Your
86
current directory should be the same as this README.txt file and setup.py.
97

10-
cd sc2datahub
8+
cd datameta
119

1210
- Create a Python virtual environment, if not already created.
1311

@@ -33,7 +31,7 @@ Getting Started
3331

3432
- Load default data into the database using a script.
3533

36-
env/bin/initialize_sc2datahub_db development.ini
34+
env/bin/initialize_datameta_db development.ini
3735

3836
- Run your project's tests.
3937

File renamed without changes.

sc2datahub/alembic/env.py datameta/alembic/env.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from pyramid.paster import get_appsettings, setup_logging
44
from sqlalchemy import engine_from_config
55

6-
from sc2datahub.models.meta import Base
6+
from datameta.models.meta import Base
77

88
config = context.config
99

File renamed without changes.
File renamed without changes.

sc2datahub/models/__init__.py datameta/models/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def includeme(config):
5353
"""
5454
Initialize the model for a Pyramid app.
5555
56-
Activate this setup using ``config.include('sc2datahub.models')``.
56+
Activate this setup using ``config.include('datameta.models')``.
5757
5858
"""
5959
settings = config.get_settings()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

sc2datahub/templates/layout.pt datameta/templates/layout.pt

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="description" content="pyramid web application">
88
<meta name="author" content="Pylons Project">
9-
<link rel="shortcut icon" href="${request.static_url('sc2datahub:static/pyramid-16x16.png')}">
9+
<link rel="shortcut icon" href="${request.static_url('datameta:static/pyramid-16x16.png')}">
1010

1111
<title>Cookiecutter Starter project for the Pyramid Web Framework</title>
1212

1313
<!-- Bootstrap core CSS -->
1414
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
1515

1616
<!-- Custom styles for this scaffold -->
17-
<link href="${request.static_url('sc2datahub:static/theme.css')}" rel="stylesheet">
17+
<link href="${request.static_url('datameta:static/theme.css')}" rel="stylesheet">
1818

1919
<!-- HTML5 shiv and Respond.js IE8 support of HTML5 elements and media queries -->
2020
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
2929
<div class="container">
3030
<div class="row">
3131
<div class="col-md-2">
32-
<img class="logo img-responsive" src="${request.static_url('sc2datahub:static/pyramid.png')}" alt="pyramid web framework">
32+
<img class="logo img-responsive" src="${request.static_url('datameta:static/pyramid.png')}" alt="pyramid web framework">
3333
</div>
3434
<div class="col-md-10">
3535
<div metal:define-slot="content">No content</div>
File renamed without changes.

sc2datahub/tests.py datameta/tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_passing_view(self):
5555
from .views.default import my_view
5656
info = my_view(dummy_request(self.session))
5757
self.assertEqual(info['one'].name, 'one')
58-
self.assertEqual(info['project'], 'SARS-CoV-2 Data Hub')
58+
self.assertEqual(info['project'], 'DataMeta - submission server for data and affiliated metadata')
5959

6060

6161
class TestMyViewFailureCondition(BaseTest):
File renamed without changes.

sc2datahub/views/default.py datameta/views/default.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def my_view(request):
1313
one = query.filter(models.MyModel.name == 'one').first()
1414
except DBAPIError:
1515
return Response(db_err_msg, content_type='text/plain', status=500)
16-
return {'one': one, 'project': 'SARS-CoV-2 Data Hub'}
16+
return {'one': one, 'project': 'DataMeta - submission server for data and affiliated metadata'}
1717

1818

1919
db_err_msg = """\
File renamed without changes.

development.ini

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
###
55

66
[app:main]
7-
use = egg:sc2datahub
7+
use = egg:datameta
88

99
pyramid.reload_templates = true
1010
pyramid.debug_authorization = false
@@ -14,7 +14,7 @@ pyramid.default_locale_name = en
1414
pyramid.includes =
1515
pyramid_debugtoolbar
1616

17-
sqlalchemy.url = sqlite:///%(here)s/sc2datahub.sqlite
17+
sqlalchemy.url = sqlite:///%(here)s/datameta.sqlite
1818

1919
retry.attempts = 3
2020

@@ -23,15 +23,15 @@ retry.attempts = 3
2323
# debugtoolbar.hosts = 127.0.0.1 ::1
2424

2525
[pshell]
26-
setup = sc2datahub.pshell.setup
26+
setup = datameta.pshell.setup
2727

2828
###
2929
# wsgi server configuration
3030
###
3131

3232
[alembic]
3333
# path to migration scripts
34-
script_location = sc2datahub/alembic
34+
script_location = datameta/alembic
3535
file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s
3636
# file_template = %%(rev)s_%%(slug)s
3737

@@ -45,7 +45,7 @@ listen = localhost:6543
4545
###
4646

4747
[loggers]
48-
keys = root, sc2datahub, sqlalchemy
48+
keys = root, datameta, sqlalchemy
4949

5050
[handlers]
5151
keys = console
@@ -57,10 +57,10 @@ keys = generic
5757
level = INFO
5858
handlers = console
5959

60-
[logger_sc2datahub]
60+
[logger_datameta]
6161
level = DEBUG
6262
handlers =
63-
qualname = sc2datahub
63+
qualname = datameta
6464

6565
[logger_sqlalchemy]
6666
level = WARN

production.ini

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44
###
55

66
[app:main]
7-
use = egg:sc2datahub
7+
use = egg:datameta
88

99
pyramid.reload_templates = false
1010
pyramid.debug_authorization = false
1111
pyramid.debug_notfound = false
1212
pyramid.debug_routematch = false
1313
pyramid.default_locale_name = en
1414

15-
sqlalchemy.url = sqlite:///%(here)s/sc2datahub.sqlite
15+
sqlalchemy.url = sqlite:///%(here)s/datameta.sqlite
1616

1717
retry.attempts = 3
1818

1919
[pshell]
20-
setup = sc2datahub.pshell.setup
20+
setup = datameta.pshell.setup
2121

2222
###
2323
# wsgi server configuration
2424
###
2525

2626
[alembic]
2727
# path to migration scripts
28-
script_location = sc2datahub/alembic
28+
script_location = datameta/alembic
2929
file_template = %%(year)d%%(month).2d%%(day).2d_%%(rev)s
3030
# file_template = %%(rev)s_%%(slug)s
3131

@@ -39,7 +39,7 @@ listen = *:6543
3939
###
4040

4141
[loggers]
42-
keys = root, sc2datahub, sqlalchemy
42+
keys = root, datameta, sqlalchemy
4343

4444
[handlers]
4545
keys = console
@@ -51,10 +51,10 @@ keys = generic
5151
level = WARN
5252
handlers = console
5353

54-
[logger_sc2datahub]
54+
[logger_datameta]
5555
level = WARN
5656
handlers =
57-
qualname = sc2datahub
57+
qualname = datameta
5858

5959
[logger_sqlalchemy]
6060
level = WARN

pytest.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[pytest]
2-
testpaths = sc2datahub
2+
testpaths = datameta
33
python_files = test*.py

setup.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
]
5050

5151
setup(
52-
name='sc2datahub',
52+
name='datameta',
5353
version='0.9.0alpha1',
54-
description='SARS-CoV-2 Data Hub',
54+
description='DataMeta - submission server for data and affiliated metadata',
5555
long_description=README + '\n\n' + CHANGES,
5656
classifiers=[
5757
'Programming Language :: Python',
@@ -72,10 +72,10 @@
7272
install_requires=requires,
7373
entry_points={
7474
'paste.app_factory': [
75-
'main = sc2datahub:main',
75+
'main = datameta:main',
7676
],
7777
'console_scripts': [
78-
'initialize_sc2datahub_db=sc2datahub.scripts.initialize_db:main',
78+
'initialize_datameta_db=datameta.scripts.initialize_db:main',
7979
],
8080
},
8181
)

0 commit comments

Comments
 (0)