Skip to content

Commit

Permalink
Merge pull request #1694 from neptune-ai/dev/2.0
Browse files Browse the repository at this point in the history
Merged dev branch into master
  • Loading branch information
Raalsky authored Mar 25, 2024
2 parents d6b5e10 + 2cd91a3 commit 88453c4
Show file tree
Hide file tree
Showing 285 changed files with 1,455 additions and 14,066 deletions.
128 changes: 0 additions & 128 deletions .github/neptune_client_pyproject.toml

This file was deleted.

181 changes: 1 addition & 180 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,33 +42,6 @@ jobs:
name: neptune-package
path: dist/

build-neptune-client:
runs-on: ubuntu-latest
# needs: [wait-for-green-master]
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install Python
uses: actions/setup-python@v5
with:
python-version: "3.10"

- name: Install build dependencies
run: pip install poetry poetry-dynamic-versioning

- name: Build package
run: |
cp .github/neptune_client_pyproject.toml pyproject.toml
poetry build
- uses: actions/upload-artifact@v4
with:
name: neptune-client-package
path: dist/

test-clean-install-neptune:
needs: [ build-neptune ]
runs-on: ubuntu-latest
Expand All @@ -85,135 +58,12 @@ jobs:
run: pip list

- name: Test imports
run: python -c "from neptune.new import init_run; from neptune import init_run"

test-clean-install-neptune-client:
needs: [ build-neptune-client ]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: neptune-client-package
path: dist

- name: Install neptune-client package
run: pip install --force-reinstall --pre -f ./dist neptune-client

- name: List dependencies
run: pip list

- name: Test imports
run: python -c "from neptune.new import init_run; from neptune import init_run"

test-neptune-and-neptune-client:
needs: [ build-neptune-client, build-neptune ]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: neptune-client-package
path: dist

- uses: actions/download-artifact@v4
with:
name: neptune-package
path: dist

- name: Install neptune-client package
run: pip install --force-reinstall --pre -f ./dist neptune-client

- name: Install neptune package
run: pip install --force-reinstall --pre -f ./dist neptune

- name: List dependencies
run: pip list

- name: Run tests
run: |
echo "TEST_EXIT_CODE=$(python -c "from neptune.new import init_run; from neptune import init_run")" >> $GITHUB_ENV
- name: Test that fails (due to RuntimeException)
if: env.TEST_EXIT_CODE == '0'
run: exit 1

test-upgrade-0-16:
needs: [ build-neptune-client ]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: neptune-client-package
path: dist

- name: Install neptune-client 0.16
run: pip install neptune-client==0.16.18

- name: Install new neptune-client package
run: pip install --force-reinstall --pre -f ./dist neptune-client

- name: List dependencies
run: pip list

- name: Test imports
run: python -c "from neptune.new import init_run; from neptune import init_run"

test-uninstall-0-16-install-neptune-client:
needs: [ build-neptune-client ]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: neptune-client-package
path: dist

- name: Install neptune-client 0.16
run: pip install neptune-client==0.16.18

- name: Uninstall neptune-client
run: pip uninstall neptune-client -y

- name: Install new neptune-client package
run: pip install --force-reinstall --pre -f ./dist neptune-client

- name: List dependencies
run: pip list

- name: Test imports
run: python -c "from neptune.new import init_run; from neptune import init_run"

test-uninstall-0-16-install-neptune:
needs: [ build-neptune ]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: neptune-package
path: dist

- name: Install neptune-client 0.16
run: pip install neptune-client==0.16.18

- name: Uninstall neptune-client
run: pip uninstall neptune-client -y

- name: Install new neptune package
run: pip install --force-reinstall --pre -f ./dist neptune

- name: List dependencies
run: pip list

- name: Test imports
run: python -c "from neptune.new import init_run; from neptune import init_run"
run: python -c "from neptune import init_run"

publish-neptune:
needs:
- build-neptune
- test-upgrade-0-16
- test-clean-install-neptune
- test-clean-install-neptune-client
- test-neptune-and-neptune-client
- test-uninstall-0-16-install-neptune-client
- test-uninstall-0-16-install-neptune
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
Expand All @@ -233,32 +83,3 @@ jobs:
with:
user: __token__
password: ${{ secrets.NEPTUNE_PYPI_API_TOKEN }}

publish-neptune-client:
needs:
- build-neptune-client
- test-upgrade-0-16
- test-clean-install-neptune
- test-clean-install-neptune-client
- test-neptune-and-neptune-client
- test-uninstall-0-16-install-neptune-client
- test-uninstall-0-16-install-neptune
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v4
with:
name: neptune-client-package
path: dist/

- name: Uploading to test PyPI
uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/

- name: Publish package
uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.NEPTUNE_CLIENT_PYPI_API_TOKEN }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repos:
rev: v1.5.4
hooks:
- id: insert-license
files: ^src/neptune/(?!new/|legacy/|vendor/)[^/]+(?:/[^/]+)*\.py$
files: ^src/neptune/(?!new/|vendor/)[^/]+(?:/[^/]+)*\.py$
args: [ "--license-filepath", ".github/license_header.txt", "--allow-past-years"]
- repo: https://github.com/pycqa/flake8
rev: 7.0.0
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## [UNRELEASED] neptune 2.0.0

### Breaking changes
- Deleted `neptune.new` package ([#1684](https://github.com/neptune-ai/neptune-client/pull/1684))
- Deleted `neptune.legacy` package ([#1685](https://github.com/neptune-ai/neptune-client/pull/1685))
- Deleted `neptune.common` package ([#1693](https://github.com/neptune-ai/neptune-client/pull/1693))
([#1690](https://github.com/neptune-ai/neptune-client/pull/1690))
- Renamed `metadata_containers` to `objects` ([#1696](https://github.com/neptune-ai/neptune-client/pull/1696))
- Removed `neptune-client` ([#1699](https://github.com/neptune-ai/neptune-client/pull/1699))
- Deleted `neptune.logging` package ([#1698](https://github.com/neptune-ai/neptune-client/pull/1698))
- Disabled `Model` ([#1701](https://github.com/neptune-ai/neptune-client/pull/1701))
- Disabled `ModelVersion` ([#1701](https://github.com/neptune-ai/neptune-client/pull/1708))
- Disabled `Project` ([#1709](https://github.com/neptune-ai/neptune-client/pull/1709))

### Features
- ?


## neptune 1.10.0

### Features
Expand Down
11 changes: 2 additions & 9 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,12 @@ component_management:
- src/neptune/cli/**
- src/neptune/common/**
- src/neptune/internal/**
- src/neptune/logging/**
- src/neptune/metadata_containers/**
- src/neptune/objects/**
- src/neptune/new/**
- src/netpune/types/**
- src/neptune/types/**
- src/neptune/vendor/**
- src/neptune/*.py

- component_id: legacy
name: legacy
paths:
- src/neptune/legacy/**
- src/neptune/common/**

- component_id: management
name: management
paths:
Expand Down
Loading

0 comments on commit 88453c4

Please sign in to comment.