Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version in /api/info/ #1054

Merged
merged 18 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/frontend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v3

- name: Run E2E tests
uses: docker://ghcr.io/girder/pytest-pyppeteer:v0.0.10
uses: docker://ghcr.io/girder/pytest-pyppeteer:v0.0.11
with:
install_directory: web
install_command: yarn install
Expand Down Expand Up @@ -156,7 +156,6 @@ jobs:
key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }}

- name: Install dandi-api dependencies
if: steps.pip-cache.outputs.cache-hit != 'true'
run: pip install --upgrade --upgrade-strategy eager -e .[dev]

- name: Apply migrations to API server
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/update-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [released]

jobs:
release:
reset-release-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -14,11 +14,19 @@ jobs:
token: ${{ secrets.GH_TOKEN }} # use PAT with permissions to push to master
ref: release

- name: Reset release branch
- name: Perform reset
run: |
git reset --hard ${{ github.ref }}
git push --force origin release

production-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # fetch history for all branches and tags
ref: release

- name: Deploy to Heroku
uses: akhileshns/heroku-deploy@v3.12.12
with:
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# Include any data files such as templates or static assets in the source distribution
graft dandiapi
include versioneer.py
include dandiapi/_version.py
9 changes: 3 additions & 6 deletions dandiapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# This project module is imported for us when Django starts. To ensure that Celery app is always
# defined prior to any shared_task definitions (so those tasks will bind to the app), import
# the Celery module here for side effects.
from ._version import get_versions
from .celery import app as _celery_app # noqa: F401
from pkg_resources import get_distribution

# Do not import anything else from this file, to avoid interfering with the startup order of the
# Celery app and Django's settings.
from .celery import app as _celery_app # noqa: F401

__version__ = get_versions()['version']
del get_versions
__version__ = get_distribution('dandiapi').version
Loading