Skip to content

Commit

Permalink
feat(notify-server): Delete notify-server (#14280)
Browse files Browse the repository at this point in the history
  • Loading branch information
SyntaxColoring authored Jan 30, 2024
1 parent 8d8434f commit 7d691f0
Show file tree
Hide file tree
Showing 73 changed files with 288 additions and 2,737 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ storybook-static
api/**
update-server/**
robot-server/**
notify-server/**
shared-data/python/**
hardware-testing/**

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/g-code-testing-lint-test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This workflow runs test and lint on branch pushes that touch the
# notify-server project or its dependencies
# g-code-testing project or its dependencies

name: 'G-Code Testing Lint & Test'

Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/notify-server-lint-test.yaml
Original file line number Diff line number Diff line change
@@ -1,70 +0,0 @@
# This workflow runs test and lint on branch pushes that touch the
# notify-server project or its dependencies

name: 'Notify server lint/test'

on:
# Most of the time, we run on pull requests, which lets us handle external PRs
push:
paths:
- 'Makefile'
- 'notify-server/**/*'
- '.github/workflows/notify-server-lint-test.yaml'
- 'api/**/*'
- 'hardware/**/*'
- 'scripts/**/*.mk'
- 'scripts/**/*.py'
- '.github/actions/python/**/*'
branches:
- 'edge'
- 'release'
- '*hotfix*'
tags-ignore:
- '*'
pull_request:
paths:
- 'Makefile'
- 'notify-server/**/*'
- 'api/**/*'
- 'hardware/**/*'
- 'scripts/**/*.mk'
- 'scripts/**/*.py'
- '.github/actions/python/**/*'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ github.ref_name != 'edge' || github.run_id}}-${{ github.ref_type != 'tag' || github.run_id }}
cancel-in-progress: true

defaults:
run:
shell: bash

jobs:
lint-test:
name: 'notify server package linting and tests'
timeout-minutes: 20
runs-on: 'ubuntu-22.04'
steps:
- uses: 'actions/checkout@v3'
with:
fetch-depth: 0
- uses: 'actions/setup-node@v3'
with:
node-version: '16'
- uses: 'actions/setup-python@v4'
with:
python-version: '3.10'

- uses: './.github/actions/python/setup'
with:
project: 'notify-server'
- name: Lint
run: make -C notify-server lint
- name: Test
run: make -C notify-server test-cov
- name: 'Upload coverage report'
uses: 'codecov/codecov-action@v3'
with:
files: ./notify-server/coverage.xml
flags: notify-server
2 changes: 0 additions & 2 deletions .github/workflows/robot-server-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
- 'server-utils/**/*'
- '!shared-data/js/**/*'
- 'robot-server/**/*'
- 'notify-server/**/*'
- 'scripts/**/*.mk'
- 'scripts/**/*.py'
- '.github/workflows/robot-server-lint-test.yaml'
Expand All @@ -34,7 +33,6 @@ on:
- 'server-utils/**/*'
- '!shared-data/js/**/*'
- 'robot-server/**/*'
- 'notify-server/**/*'
- 'scripts/**/*.mk'
- 'scripts/**/*.py'
- '.github/workflows/robot-server-lint-test.yaml'
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ calibrations/
api/pyproject.toml
robot-server/pyproject.toml
update-server/pyproject.toml
notify-server/pyproject.toml
shared-data/python/pyproject.toml
hardware/pyproject.toml

Expand All @@ -135,7 +134,6 @@ hardware/pyproject.toml
# file
api/LICENSE
update-server/LICENSE
notify-server/LICENSE
shared-data/python/LICENSE
shared-data/LICENSE
robot-server/LICENSE
Expand Down
3 changes: 1 addition & 2 deletions Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/api/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/update-server/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/robot-server/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/shared-data/python/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/notify-server/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/system-server/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/server-utils/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/hardware/Config.in"
source "$BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH/hardware/Config.in"
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,11 @@ COPY api/setup.py api/setup.py
COPY api/pypi-readme.rst api/pypi-readme.rst
COPY api/src/opentrons api/src/opentrons

COPY notify-server/setup.py notify-server/setup.py
COPY notify-server/README.rst notify-server/README.rst
COPY notify-server/notify_server notify-server/notify_server

COPY robot-server/setup.py robot-server/setup.py
COPY robot-server/robot_server robot-server/robot_server

RUN cd shared-data/python && python3 setup.py bdist_wheel -d /dist/
RUN cd api && python3 setup.py bdist_wheel -d /dist/
RUN cd notify-server && python3 setup.py bdist_wheel -d /dist/
RUN cd robot-server && python3 setup.py bdist_wheel -d /dist/

FROM base
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ COMPONENTS_DIR := components
DISCOVERY_CLIENT_DIR := discovery-client
G_CODE_TESTING_DIR := g-code-testing
LABWARE_LIBRARY_DIR := labware-library
NOTIFY_SERVER_DIR := notify-server
PROTOCOL_DESIGNER_DIR := protocol-designer
SHARED_DATA_DIR := shared-data
UPDATE_SERVER_DIR := update-server
Expand All @@ -26,7 +25,7 @@ HARDWARE_DIR := hardware
USB_BRIDGE_DIR := usb-bridge
NODE_USB_BRIDGE_CLIENT_DIR := usb-bridge/node-client

PYTHON_DIRS := $(API_DIR) $(UPDATE_SERVER_DIR) $(NOTIFY_SERVER_DIR) $(ROBOT_SERVER_DIR) $(SERVER_UTILS_DIR) $(SHARED_DATA_DIR)/python $(G_CODE_TESTING_DIR) $(HARDWARE_DIR) $(USB_BRIDGE_DIR)
PYTHON_DIRS := $(API_DIR) $(UPDATE_SERVER_DIR) $(ROBOT_SERVER_DIR) $(SERVER_UTILS_DIR) $(SHARED_DATA_DIR)/python $(G_CODE_TESTING_DIR) $(HARDWARE_DIR) $(USB_BRIDGE_DIR)

# This may be set as an environment variable (and is by CI tasks that upload
# to test pypi) to add a .dev extension to the python package versions. If
Expand Down Expand Up @@ -140,8 +139,6 @@ push:
sleep 1
$(MAKE) -C $(SERVER_UTILS_DIR) push
sleep 1
$(MAKE) -C $(NOTIFY_SERVER_DIR) push
sleep 1
$(MAKE) -C $(SYSTEM_SERVER_DIR) push
sleep 1
$(MAKE) -C $(ROBOT_SERVER_DIR) push
Expand All @@ -156,7 +153,6 @@ push-ot3:
$(MAKE) -C $(HARDWARE_DIR) push-no-restart-ot3
$(MAKE) -C $(API_DIR) push-no-restart-ot3
$(MAKE) -C $(SERVER_UTILS_DIR) push-ot3
$(MAKE) -C $(NOTIFY_SERVER_DIR) push-ot3
$(MAKE) -C $(ROBOT_SERVER_DIR) push-ot3
$(MAKE) -C $(SYSTEM_SERVER_DIR) push-ot3
$(MAKE) -C $(UPDATE_SERVER_DIR) push-ot3
Expand Down Expand Up @@ -193,7 +189,6 @@ test-py: test-py-windows
$(MAKE) -C $(UPDATE_SERVER_DIR) test
$(MAKE) -C $(ROBOT_SERVER_DIR) test
$(MAKE) -C $(SERVER_UTILS_DIR) test
$(MAKE) -C $(NOTIFY_SERVER_DIR) test
$(MAKE) -C $(G_CODE_TESTING_DIR) test
$(MAKE) -C $(USB_BRIDGE_DIR) test

Expand Down
5 changes: 5 additions & 0 deletions api/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ log][]. For a list of currently known issues, please see the [Opentrons issue tr
### HTTP API

- In the `/runs/commands`, `/maintenance_runs/commands`, and `/protocols` endpoints, the `dispense` command will now return an error if you try to dispense more than you've aspirated, instead of silently clamping.
- The `/notifications/subscribe` WebSocket endpoint has been removed. See https://github.com/Opentrons/opentrons/pull/14280 for details.

### Other Changes

- The `notify_server` Python package has been removed. See https://github.com/Opentrons/opentrons/pull/14280 for details.

---

Expand Down
1 change: 0 additions & 1 deletion external.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/api/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/update-server/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/robot-server/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/shared-data/python/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/notify-server/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/system-server/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/server-utils/buildroot.mk
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/hardware/buildroot.mk
1 change: 0 additions & 1 deletion g-code-testing/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ name = "pypi"

[packages]
opentrons = { editable = true, path = "./../api" }
notify-server = { editable = true, path = "./../notify-server" }
robot-server = { editable = true, path = "./../robot-server" }
server-utils = { editable = true, path = "./../server-utils" }
opentrons-shared-data = { editable = true, path = "../shared-data/python" }
Expand Down
Loading

0 comments on commit 7d691f0

Please sign in to comment.