Skip to content

Commit 1565c2d

Browse files
committed
merge core and match
1 parent cfe44ee commit 1565c2d

File tree

118 files changed

+554
-2905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+554
-2905
lines changed

.github/workflows/combineapp-pytest.yml

-15
This file was deleted.

.github/workflows/core-pytest.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Run pytest on pgscatalog.core
2+
3+
on:
4+
push:
5+
paths:
6+
- 'pgscatalog.core/**.py'
7+
pull_request:
8+
paths:
9+
- 'pgscatalog.core/**.py'
10+
11+
jobs:
12+
pytest-core:
13+
uses: ./.github/workflows/pytest.yaml
14+
with:
15+
package-directory: "pgscatalog.core"

.github/workflows/corelib-publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Publish corelib
1+
name: Publish pgscatalog.core
22

33
on:
44
workflow_dispatch:
55
inputs:
66
package-directory:
77
type: choice
88
options:
9-
- pgscatalog.corelib
9+
- pgscatalog.core
1010
python-version:
1111
required: false
1212
type: choice

.github/workflows/corelib-pytest.yml

-15
This file was deleted.

.github/workflows/downloadapp-pytest.yml

-15
This file was deleted.

.github/workflows/match-pytest.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Run pytest on pgscatalog.match
2+
3+
on:
4+
push:
5+
paths:
6+
- 'pgscatalog.match/**.py'
7+
pull_request:
8+
paths:
9+
- 'pgscatalog.match/**.py'
10+
11+
jobs:
12+
pytest-match:
13+
uses: ./.github/workflows/pytest.yaml
14+
with:
15+
package-directory: "pgscatalog.match"

.github/workflows/matchapp-pytest.yml

-15
This file was deleted.

.github/workflows/matchlib-pytest.yml

-15
This file was deleted.

docs/conf.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@
3434

3535
# use autoapi for packages that provide APIs (libraries)
3636
autoapi_dirs = [
37-
"../pgscatalog.corelib/src/pgscatalog",
38-
"../pgscatalog.matchlib/src/pgscatalog",
37+
"../pgscatalog.core/src/pgscatalog/",
38+
"../pgscatalog.match/src/pgscatalog",
3939
"../pgscatalog.calclib/src/pgscatalog",
4040
]
41+
4142
# see _templates/autoapi/index.rst for autoapi fix
4243
autoapi_template_dir = "_templates/autoapi"
4344
autoapi_python_use_implicit_namespaces = True
@@ -57,6 +58,8 @@
5758
def skip_submodules(app, what, name, obj, skip, options):
5859
if what == "module":
5960
skip = True
61+
if "cli" in name:
62+
skip = True
6063
return skip
6164

6265

pgscatalog.combineapp/README.md

-22
This file was deleted.

0 commit comments

Comments
 (0)