Skip to content

Commit

Permalink
Merge pull request #1 from Sage-Bionetworks/bgrande/synapsefs-only
Browse files Browse the repository at this point in the history
Duplicate `py-dcqc` repository and delete all files unrelated to SynapseFS
  • Loading branch information
Bruno Grande authored Jan 29, 2023
2 parents 2241afb + 5f62ad9 commit 1fd178c
Show file tree
Hide file tree
Showing 56 changed files with 216 additions and 2,549 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# .coveragerc to control coverage.py
[run]
branch = True
source = dcqc
source = fs-synapse
# omit = bad_file.py

[paths]
Expand Down
42 changes: 18 additions & 24 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ name: Build and publish container to Docker Hub
on:
push:
tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] # Match tags that resemble a version
workflow_dispatch:
branches:

jobs:
build:
runs-on: ubuntu-latest
env:
DOCKER_ORG: sagebionetworks
DOCKER_REPO: dcqc
steps:
-
name: Checkout
Expand All @@ -25,34 +22,31 @@ jobs:
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
name: Login to GHCR
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Compute short commit SHA ID
id: vars
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-
name: Build and push (tagged release)
uses: docker/build-push-action@v3
if: ${{ github.event_name == 'push' }}
name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
platforms: linux/amd64,linux/arm64
context: .
push: true
images: |
ghcr.io/${{ github.repository }}
tags: |
${{ env.DOCKER_ORG }}/${{ env.DOCKER_REPO }}:latest
${{ env.DOCKER_ORG }}/${{ env.DOCKER_REPO }}:${{ github.ref_name }}
${{ env.DOCKER_ORG }}/${{ env.DOCKER_REPO }}:commit-${{ steps.vars.outputs.sha_short }}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=ref,event=branch
type=sha
-
name: Build and push (manual release)
name: Build and push (all tags and branches)
uses: docker/build-push-action@v3
if: ${{ github.event_name == 'workflow_dispatch' }}
with:
platforms: linux/amd64,linux/arm64
context: .
push: true
tags: |
${{ env.DOCKER_ORG }}/${{ env.DOCKER_REPO }}:commit-${{ steps.vars.outputs.sha_short }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[settings]
profile = black
known_first_party = dcqc
known_first_party = synapsefs
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repos:
- id: autoflake

- repo: https://github.com/pycqa/isort
rev: 5.11.4
rev: 5.12.0
hooks:
- id: isort

Expand Down
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing

Welcome to `dcqc` contributor's guide.
Welcome to `fs-synapse` contributor's guide.

This document focuses on getting any potential contributor familiarized with
the development processes, but [other kinds of contributions] are also appreciated.
Expand All @@ -16,7 +16,7 @@ behavior guidelines.

## Issue Reports

If you experience bugs or general issues with `dcqc`, please have a look
If you experience bugs or general issues with `fs-synapse`, please have a look
on the [issue tracker].
If you don't see anything useful there, please feel free to fire an issue report.

Expand All @@ -34,17 +34,17 @@ you help us to identify the root cause of the issue.

## Documentation Improvements

You can help improve `dcqc` docs by making them more readable and coherent, or
You can help improve `fs-synapse` docs by making them more readable and coherent, or
by adding missing information and correcting mistakes.

`dcqc` documentation uses [Sphinx] as its main documentation compiler.
`fs-synapse` documentation uses [Sphinx] as its main documentation compiler.
This means that the docs are kept in the same repository as the project code, and
that any documentation update is done in the same way was a code contribution.
The documentation is written using [CommonMark] with [MyST] extensions.

:::{tip}
Please notice that the [GitHub web interface] provides a quick way of
propose changes in `dcqc`'s files. While this mechanism can
propose changes in `fs-synapse`'s files. While this mechanism can
be tricky for normal code contributions, it works perfectly fine for
contributing to the docs, and can be quite handy.

Expand Down Expand Up @@ -97,8 +97,8 @@ This often provides additional considerations and avoids unnecessary work.
3. Clone this copy to your local disk:

```console
git clone [email protected]:Sage-Bionetworks-Workflows/py-dcqc.git
cd dcqc
git clone [email protected]:Sage-Bionetworks/fs-synapse.git
cd fs-synapse
```

4. You should run:
Expand All @@ -116,7 +116,7 @@ This often provides additional considerations and avoids unnecessary work.
pipenv run pre-commit install
```

`dcqc` comes with a lot of hooks configured to automatically help the
`fs-synapse` comes with a lot of hooks configured to automatically help the
developer to check the code being written.

### Implement your changes
Expand Down Expand Up @@ -245,7 +245,7 @@ package:

If you are part of the group of maintainers and have correct user permissions
on [PyPI], the following steps can be used to release a new version for
`dcqc`:
`fs-synapse`:

1. Make sure all unit tests are successful.
2. Tag the current commit on the main branch with a release tag, e.g., `v1.2.3`.
Expand Down Expand Up @@ -291,5 +291,5 @@ on [PyPI], the following steps can be used to release a new version for
[tox]: https://tox.readthedocs.io/en/stable/
[virtual environment]: https://realpython.com/python-virtual-environments-a-primer/
[virtualenv]: https://virtualenv.pypa.io/en/stable/
[repository]: https://github.com/sage-bionetworks-workflows/py-dcqc
[issue tracker]: https://github.com/sage-bionetworks-workflows/py-dcqc/issues
[repository]: https://github.com/sage-bionetworks-workflows/py-fs-synapse
[issue tracker]: https://github.com/sage-bionetworks-workflows/py-fs-synapse/issues
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ COPY src ./src/
RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_SAGETASKS=${PKG_VERSION} \
python -m pip install .

CMD [ "python", "-c", "import dcqc" ]
CMD [ "python", "-c", "import synapsefs" ]
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ verify_ssl = true
name = "pypi"

[packages]
dcqc = {editable = true, path = "."}
fs-synapse = {editable = true, path = "."}

[dev-packages]
dcqc = {editable = true, path = ".", extras = ["testing", "dev"]}
fs-synapse = {editable = true, path = ".", extras = ["testing", "dev"]}

[requires]
python_version = "3.11"
70 changes: 18 additions & 52 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1fd178c

Please sign in to comment.