Skip to content

Commit 1df172d

Browse files
author
Drew Yang
committed
Merge branch 'master' into DEV-846-dj-release
2 parents df28772 + e042594 commit 1df172d

File tree

3 files changed

+97
-6
lines changed

3 files changed

+97
-6
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
day: "wednesday"
8+
time: "9:00"
9+
timezone: "America/Chicago"
10+
groups:
11+
all-actions:
12+
patterns: [ "*" ]

README.md

Lines changed: 83 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,88 @@
1-
[![DOI](https://zenodo.org/badge/16774/datajoint/datajoint-python.svg)](https://zenodo.org/badge/latestdoi/16774/datajoint/datajoint-python)
2-
[![Coverage Status](https://coveralls.io/repos/datajoint/datajoint-python/badge.svg?branch=master&service=github)](https://coveralls.io/github/datajoint/datajoint-python?branch=master)
3-
[![PyPI version](https://badge.fury.io/py/datajoint.svg)](http://badge.fury.io/py/datajoint)
4-
[![Slack](https://img.shields.io/badge/slack-chat-green.svg)](https://datajoint.slack.com/)
5-
61
# Welcome to DataJoint for Python!
72

3+
<table>
4+
<!-- Thank Zarr for providing badge insights! -->
5+
<!-- https://github.com/zarr-developers/zarr-python/blob/main/README.md -->
6+
<tr>
7+
<td>PyPI</td>
8+
<td>
9+
<a href="https://pypi.org/project/datajoint/">
10+
<img src="https://img.shields.io/pypi/v/datajoint?color=blue" alt="pypi release" />
11+
</a>
12+
<br>
13+
<a href="https://pypi.org/project/datajoint/">
14+
<img src="https://img.shields.io/pypi/dm/datajoint?color=yellow" alt="pypi downloads" />
15+
</a>
16+
</td>
17+
</tr>
18+
<tr>
19+
<td>Conda Forge</td>
20+
<td>
21+
<a href="https://anaconda.org/conda-forge/datajoint">
22+
<img src="https://img.shields.io/conda/vn/conda-forge/datajoint?color=brightgreen" alt="conda-forge release" />
23+
</a>
24+
<br>
25+
<a href="https://anaconda.org/conda-forge/datajoint">
26+
<img src="https://img.shields.io/conda/dn/conda-forge/datajoint?color=brightgreen" alt="conda-forge downloads" />
27+
</a>
28+
</td>
29+
</tr>
30+
<tr>
31+
<td>Since Release</td>
32+
<td>
33+
<a href="https://github.com/datajoint/datajoint-python/compare/latest...master">
34+
<img src="https://img.shields.io/github/commits-since/datajoint/datajoint-python/latest?color=red" alt="commit since last release" />
35+
</a>
36+
</td>
37+
</tr>
38+
<tr>
39+
<td>Test Status</td>
40+
<td>
41+
<a href="https://github.com/datajoint/datajoint-python/actions/workflows/development.yaml">
42+
<img src="https://github.com/datajoint/datajoint-python/actions/workflows/development.yaml/badge.svg" alt="test status" />
43+
</a>
44+
</td>
45+
</tr>
46+
<tr>
47+
<td>Coverage</td>
48+
<td>
49+
<a href="https://coveralls.io/github/datajoint/datajoint-python?branch=master">
50+
<img src="https://coveralls.io/repos/datajoint/datajoint-python/badge.svg?branch=master&service=github"/ alt="coverage">
51+
</a>
52+
</td>
53+
</tr>
54+
<tr>
55+
<td>Developer Chat</td>
56+
<td>
57+
<a href="https://datajoint.slack.com/">
58+
<img src="https://img.shields.io/badge/slack-datajoint-purple.svg" alt="datajoint slack"/>
59+
</a>
60+
</td>
61+
</tr>
62+
<tr>
63+
<td>License</td>
64+
<td>
65+
<a href="https://github.com/datajoint/datajoint-python/blob/master/LICENSE.txt">
66+
<img src="https://img.shields.io/github/license/datajoint/datajoint-python" alt="LGPL-2.1" />
67+
</a>
68+
</td>
69+
</tr>
70+
<tr>
71+
<td>Citation</td>
72+
<td>
73+
<a href="https://doi.org/10.1101/031658">
74+
<img src="https://img.shields.io/badge/DOI-10.1101/bioRxiv.031658-B31B1B.svg" alt="bioRxiv">
75+
</a>
76+
<br>
77+
<a href="https://doi.org/10.5281/zenodo.6829062">
78+
<img src="https://zenodo.org/badge/DOI/10.5281/zenodo.6829062.svg" alt="zenodo">
79+
</a>
80+
</td>
81+
</tr>
82+
83+
</table>
84+
85+
886
DataJoint for Python is a framework for scientific workflow management based on
987
relational principles. DataJoint is built on the foundation of the relational data
1088
model and prescribes a consistent method for organizing, populating, computing, and

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ dependencies = [
2121
"otumat",
2222
"faker",
2323
"cryptography",
24-
"urllib3"
24+
"urllib3",
25+
"setuptools",
2526
]
2627
requires-python = ">=3.9,<4.0"
2728
authors = [

0 commit comments

Comments
 (0)