Move SDK to top-level

Signed-off-by: Ryan Beck-Buysse <[email protected]>
hyperledger-archives · Feb 18, 2019 · cf25d39 · cf25d39
1 parent c67bb0d
commit cf25d39
Show file tree

Hide file tree

Showing 59 changed files with 38 additions and 39 deletions.
diff --git a/sdk/python/Dockerfile → Dockerfile b/sdk/python/Dockerfile → Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -f sdk/python/Dockerfile-installed -t sawtooth-sdk-python-local .
+# docker build -f Dockerfile -t sawtooth-sdk-python-local .
 
 # -------------=== python sdk build ===-------------
 
@@ -50,6 +50,5 @@ WORKDIR /project/sawtooth-core
 
 CMD echo "\033[0;32m--- Building python sdk ---\n\033[0m" \
  && bin/protogen \
- && cd sdk/python \
  && python3 setup.py clean --all \
  && python3 setup.py build
diff --git a/sdk/python/Dockerfile-installed-bionic → Dockerfile-installed-bionic b/sdk/python/Dockerfile-installed-bionic → Dockerfile-installed-bionic
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -f sdk/python/Dockerfile-installed-bionic -t sawtooth-sdk-python .
+# docker build -f Dockerfile-installed-bionic -t sawtooth-sdk-python .
 
 # -------------=== signing build ===-------------
 FROM ubuntu:bionic as sawtooth-signing-builder
@@ -77,7 +77,7 @@ COPY . /project
 RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
  && apt-get -f -y install \
  && /project/bin/protogen \
- && cd /project/sdk/python \
+ && cd /project \
  && if [ -d "debian" ]; then rm -rf debian; fi \
  && python3 setup.py clean --all \
  && python3 setup.py --command-packages=stdeb.command debianize \
@@ -92,7 +92,7 @@ RUN apt-get update \
  && apt-get install gnupg -y
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sources.list \
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \

diff --git a/sdk/python/Dockerfile-installed-xenial → Dockerfile-installed-xenial b/sdk/python/Dockerfile-installed-xenial → Dockerfile-installed-xenial
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# docker build -f sdk/python/Dockerfile-installed-xenial -t sawtooth-sdk-python .
+# docker build -f Dockerfile-installed-xenial -t sawtooth-sdk-python .
 
 # -------------=== signing build ===-------------
 FROM ubuntu:xenial as sawtooth-signing-builder
@@ -71,7 +71,7 @@ COPY . /project
 RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
  && apt-get -f -y install \
  && /project/bin/protogen \
- && cd /project/sdk/python \
+ && cd /project \
  && if [ -d "debian" ]; then rm -rf debian; fi \
  && python3 setup.py clean --all \
  && python3 setup.py --command-packages=stdeb.command debianize \
@@ -83,7 +83,7 @@ RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
 FROM ubuntu:xenial
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sources.list \
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \

diff --git a/bin/intkey b/bin/intkey
@@ -32,7 +32,7 @@ sys.path.insert(0, os.path.join(
     'sdk', 'examples', 'intkey_python'))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 from sawtooth_intkey.client_cli.intkey_cli import main_wrapper
 

diff --git a/bin/intkey-tp-python b/bin/intkey-tp-python
@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.join(
     'sdk', 'examples', 'intkey_python'))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
     'signing'))

diff --git a/bin/noop b/bin/noop
@@ -32,7 +32,7 @@ sys.path.insert(0, os.path.join(
     'sdk', 'examples', 'noop_python'))
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 from sawtooth_noop.client_cli.main import main_wrapper
 

diff --git a/bin/protogen b/bin/protogen
@@ -40,7 +40,7 @@ def main(args=None):
     # Generate and distribute top-level protos
     proto_dir = JOIN(TOP_DIR, "protos")
 
-    protoc(proto_dir, "sdk/python", "sawtooth_sdk/protobuf")
+    protoc(proto_dir, TOP_DIR, "sawtooth_sdk/protobuf")
 
 
 def protoc(src_dir, base_dir, pkg, language="python"):

diff --git a/bin/run_bandit b/bin/run_bandit
@@ -18,8 +18,8 @@
 top_dir=$(cd $(dirname $(dirname $0)) && pwd)
 
 directories="
-    sdk/python/build
-    sdk/python/sawtooth_processor_test
+    build
+    sawtooth_processor_test
     signing/build
     signing/tests
 "

diff --git a/bin/run_lint b/bin/run_lint
@@ -165,12 +165,12 @@ export PYTHONPATH
 lint signing "$SINCE" || retval=1
 
 # sdk, xo, intkey
-PYTHONPATH=$top_dir/sdk/python
+PYTHONPATH=$top_dir/
 PYTHONPATH=$PYTHONPATH:$top_dir/sdk/examples/intkey_python
 PYTHONPATH=$PYTHONPATH:$top_dir/sdk/examples/xo_python
 PYTHONPATH=$PYTHONPATH:$top_dir/signing
 export PYTHONPATH
-lint sdk/python "$SINCE" || retval=1
+lint . "$SINCE" || retval=1
 lint sdk/examples/intkey_python "$SINCE" || retval=1
 lint sdk/examples/xo_python "$SINCE" || retval=1
 

diff --git a/bin/run_tests b/bin/run_tests
@@ -133,7 +133,7 @@ test_signing() {
 }
 
 test_python_sdk() {
-    run_docker_test ./sdk/python/tests/unit_python_sdk.yaml
+    run_docker_test ./tests/unit_python_sdk.yaml
     copy_coverage .coverage.test_python_sdk
     run_docker_test ./sdk/examples/intkey_python/tests/test_tp_intkey_python.yaml
     copy_coverage .coverage.test_tp_intkey_python

diff --git a/bin/xo b/bin/xo
@@ -29,7 +29,7 @@ sys.path.insert(0, os.path.join(
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),

diff --git a/bin/xo-tp-python b/bin/xo-tp-python
@@ -29,7 +29,7 @@ sys.path.insert(0, os.path.join(
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
-    'sdk', 'python'))
+    ))
 
 sys.path.insert(0, os.path.join(
     os.path.dirname(os.path.dirname(os.path.realpath(__file__))),

diff --git a/ci/sawtooth-publish-python-sdk b/ci/sawtooth-publish-python-sdk
@@ -42,7 +42,7 @@ password=@PASS@\n\
 
 CMD sed -i'' -e "s/@USER@/$PYPI_USER/g" /root/.pypirc \
  && sed -i'' -e "s/@PASS@/$PYPI_PASS/g" /root/.pypirc \
- && cd /project/sawtooth-core/sdk/python \
+ && cd /project/sawtooth-core/ \
  && python3 setup.py sdist upload -r pypi \
  && cd /project/sawtooth-core/signing \
  && python3 setup.py sdist upload -r pypi
diff --git a/docker-compose-installed.yaml b/docker-compose-installed.yaml
@@ -47,7 +47,7 @@ services:
   python-sdk:
     build:
       context: .
-      dockerfile: sdk/python/Dockerfile-installed-${DISTRO}
+      dockerfile: Dockerfile-installed-${DISTRO}
       args:
         - http_proxy
         - https_proxy

diff --git a/docker/compose/sawtooth-build.yaml b/docker/compose/sawtooth-build.yaml
@@ -31,7 +31,7 @@ services:
   python-sdk:
     build:
       context: ../../
-      dockerfile: ./sdk/python/Dockerfile
+      dockerfile: ./Dockerfile
       args:
         - http_proxy
         - https_proxy

diff --git a/integration/sawtooth_integration/docker/test_intkey_smoke_python.yaml b/integration/sawtooth_integration/docker/test_intkey_smoke_python.yaml
@@ -144,7 +144,7 @@ services:
         test_intkey_smoke.TestIntkeySmoke
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/sdk/examples/intkey_python:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing"
diff --git a/integration/sawtooth_integration/docker/test_two_families.yaml b/integration/sawtooth_integration/docker/test_two_families.yaml
@@ -161,7 +161,7 @@ services:
         test_two_families.TestTwoFamilies
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/sdk/examples/intkey_python:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing"
diff --git a/integration/sawtooth_integration/docker/test_workload.yaml b/integration/sawtooth_integration/docker/test_workload.yaml
@@ -144,7 +144,7 @@ services:
         test_workload
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/sdk/examples/intkey_python:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing:\

diff --git a/integration/sawtooth_integration/docker/test_xo_smoke_python.yaml b/integration/sawtooth_integration/docker/test_xo_smoke_python.yaml
@@ -145,6 +145,6 @@ services:
     stop_signal: SIGKILL
     environment:
       TP_LANG: "python"
-      PYTHONPATH: "/project/sawtooth-core/sdk/python:\
+      PYTHONPATH: "/project/sawtooth-core:\
         /project/sawtooth-core/integration:\
         /project/sawtooth-core/signing"
diff --git a/sdk/python/nose2.cfg → nose2.cfg b/sdk/python/nose2.cfg → nose2.cfg
diff --git a/sdk/python/packaging/log_config.toml.example → packaging/log_config.toml.example b/sdk/python/packaging/log_config.toml.example → packaging/log_config.toml.example
diff --git a/sdk/python/packaging/path.toml.example → packaging/path.toml.example b/sdk/python/packaging/path.toml.example → packaging/path.toml.example
diff --git a/sdk/python/packaging/ubuntu/postinst → packaging/ubuntu/postinst b/sdk/python/packaging/ubuntu/postinst → packaging/ubuntu/postinst
diff --git a/...ython/sawtooth_processor_test/__init__.py → sawtooth_processor_test/__init__.py b/...ython/sawtooth_processor_test/__init__.py → sawtooth_processor_test/__init__.py
diff --git a/...awtooth_processor_test/message_factory.py → sawtooth_processor_test/message_factory.py b/...awtooth_processor_test/message_factory.py → sawtooth_processor_test/message_factory.py
diff --git a/.../sawtooth_processor_test/message_types.py → sawtooth_processor_test/message_types.py b/.../sawtooth_processor_test/message_types.py → sawtooth_processor_test/message_types.py
diff --git a/...sawtooth_processor_test/mock_validator.py → sawtooth_processor_test/mock_validator.py b/...sawtooth_processor_test/mock_validator.py → sawtooth_processor_test/mock_validator.py
diff --git a/...r_test/transaction_processor_test_case.py → ...r_test/transaction_processor_test_case.py b/...r_test/transaction_processor_test_case.py → ...r_test/transaction_processor_test_case.py
diff --git a/sdk/python/sawtooth_sdk/__init__.py → sawtooth_sdk/__init__.py b/sdk/python/sawtooth_sdk/__init__.py → sawtooth_sdk/__init__.py
diff --git a/...python/sawtooth_sdk/consensus/__init__.py → sawtooth_sdk/consensus/__init__.py b/...python/sawtooth_sdk/consensus/__init__.py → sawtooth_sdk/consensus/__init__.py
diff --git a/sdk/python/sawtooth_sdk/consensus/driver.py → sawtooth_sdk/consensus/driver.py b/sdk/python/sawtooth_sdk/consensus/driver.py → sawtooth_sdk/consensus/driver.py
diff --git a/sdk/python/sawtooth_sdk/consensus/engine.py → sawtooth_sdk/consensus/engine.py b/sdk/python/sawtooth_sdk/consensus/engine.py → sawtooth_sdk/consensus/engine.py
diff --git a/...thon/sawtooth_sdk/consensus/exceptions.py → sawtooth_sdk/consensus/exceptions.py b/...thon/sawtooth_sdk/consensus/exceptions.py → sawtooth_sdk/consensus/exceptions.py
diff --git a/sdk/python/sawtooth_sdk/consensus/service.py → sawtooth_sdk/consensus/service.py b/sdk/python/sawtooth_sdk/consensus/service.py → sawtooth_sdk/consensus/service.py
diff --git a/...thon/sawtooth_sdk/consensus/zmq_driver.py → sawtooth_sdk/consensus/zmq_driver.py b/...thon/sawtooth_sdk/consensus/zmq_driver.py → sawtooth_sdk/consensus/zmq_driver.py
diff --git a/...hon/sawtooth_sdk/consensus/zmq_service.py → sawtooth_sdk/consensus/zmq_service.py b/...hon/sawtooth_sdk/consensus/zmq_service.py → sawtooth_sdk/consensus/zmq_service.py
diff --git a/...python/sawtooth_sdk/messaging/__init__.py → sawtooth_sdk/messaging/__init__.py b/...python/sawtooth_sdk/messaging/__init__.py → sawtooth_sdk/messaging/__init__.py
diff --git a/...thon/sawtooth_sdk/messaging/exceptions.py → sawtooth_sdk/messaging/exceptions.py b/...thon/sawtooth_sdk/messaging/exceptions.py → sawtooth_sdk/messaging/exceptions.py
diff --git a/sdk/python/sawtooth_sdk/messaging/future.py → sawtooth_sdk/messaging/future.py b/sdk/python/sawtooth_sdk/messaging/future.py → sawtooth_sdk/messaging/future.py
diff --git a/sdk/python/sawtooth_sdk/messaging/stream.py → sawtooth_sdk/messaging/stream.py b/sdk/python/sawtooth_sdk/messaging/stream.py → sawtooth_sdk/messaging/stream.py
diff --git a/...python/sawtooth_sdk/processor/__init__.py → sawtooth_sdk/processor/__init__.py b/...python/sawtooth_sdk/processor/__init__.py → sawtooth_sdk/processor/__init__.py
diff --git a/sdk/python/sawtooth_sdk/processor/config.py → sawtooth_sdk/processor/config.py b/sdk/python/sawtooth_sdk/processor/config.py → sawtooth_sdk/processor/config.py
diff --git a/sdk/python/sawtooth_sdk/processor/context.py → sawtooth_sdk/processor/context.py b/sdk/python/sawtooth_sdk/processor/context.py → sawtooth_sdk/processor/context.py
diff --git a/sdk/python/sawtooth_sdk/processor/core.py → sawtooth_sdk/processor/core.py b/sdk/python/sawtooth_sdk/processor/core.py → sawtooth_sdk/processor/core.py
diff --git a/...thon/sawtooth_sdk/processor/exceptions.py → sawtooth_sdk/processor/exceptions.py b/...thon/sawtooth_sdk/processor/exceptions.py → sawtooth_sdk/processor/exceptions.py
diff --git a/sdk/python/sawtooth_sdk/processor/handler.py → sawtooth_sdk/processor/handler.py b/sdk/python/sawtooth_sdk/processor/handler.py → sawtooth_sdk/processor/handler.py
diff --git a/sdk/python/sawtooth_sdk/processor/log.py → sawtooth_sdk/processor/log.py b/sdk/python/sawtooth_sdk/processor/log.py → sawtooth_sdk/processor/log.py
diff --git a/sdk/examples/intkey_python/Dockerfile-installed-bionic b/sdk/examples/intkey_python/Dockerfile-installed-bionic
@@ -108,7 +108,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -131,7 +131,7 @@ RUN apt-get update \
  systemd
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-intkey-tp-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp
 

diff --git a/sdk/examples/intkey_python/Dockerfile-installed-xenial b/sdk/examples/intkey_python/Dockerfile-installed-xenial
@@ -99,7 +99,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -117,7 +117,7 @@ RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
 FROM ubuntu:xenial
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-intkey-tp-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp
 

diff --git a/sdk/examples/intkey_python/Dockerfile-tests-installed b/sdk/examples/intkey_python/Dockerfile-tests-installed
@@ -107,7 +107,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -130,7 +130,7 @@ RUN apt-get update \
  && apt-get install gnupg -y
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-intkey-tests-builder /project/sdk/examples/python3-sawtooth-intkey*.deb /tmp
 

diff --git a/sdk/examples/xo_python/Dockerfile-installed-bionic b/sdk/examples/xo_python/Dockerfile-installed-bionic
@@ -107,7 +107,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -130,7 +130,7 @@ RUN apt-get update \
  systemd
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-xo-tp-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp
 

diff --git a/sdk/examples/xo_python/Dockerfile-installed-xenial b/sdk/examples/xo_python/Dockerfile-installed-xenial
@@ -98,7 +98,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci xenial universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -116,7 +116,7 @@ RUN dpkg -i /tmp/python3-sawtooth-*.deb || true \
 FROM ubuntu:xenial
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-xo-tp-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp
 

diff --git a/sdk/examples/xo_python/Dockerfile-tests-installed b/sdk/examples/xo_python/Dockerfile-tests-installed
@@ -107,7 +107,7 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sou
     python3-stdeb
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY . /project
 
@@ -130,7 +130,7 @@ RUN apt-get update \
  && apt-get install gnupg -y
 
 COPY --from=sawtooth-signing-builder /project/python3-sawtooth-signing*.deb /tmp
-COPY --from=sawtooth-sdk-python-builder /project/sdk/python3-sawtooth-sdk*.deb /tmp
+COPY --from=sawtooth-sdk-python-builder /python3-sawtooth-sdk*.deb /tmp
 
 COPY --from=python-xo-tests-builder /project/sdk/examples/python3-sawtooth-xo*.deb /tmp
 

diff --git a/sdk/python/setup.py → setup.py b/sdk/python/setup.py → setup.py
@@ -40,7 +40,7 @@
 setup(
     name='sawtooth-sdk',
     version=subprocess.check_output(
-        ['../../bin/get_version']).decode('utf-8').strip(),
+        ['./bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth Python SDK',
     author='Hyperledger Sawtooth',
     url='https://github.com/hyperledger/sawtooth-core',

diff --git a/sdk/python/tests/python-sdk-tests.dockerfile → tests/python-sdk-tests.dockerfile b/sdk/python/tests/python-sdk-tests.dockerfile → tests/python-sdk-tests.dockerfile
diff --git a/sdk/python/tests/test_context.py → tests/test_context.py b/sdk/python/tests/test_context.py → tests/test_context.py
diff --git a/sdk/python/tests/test_zmq_driver.py → tests/test_zmq_driver.py b/sdk/python/tests/test_zmq_driver.py → tests/test_zmq_driver.py
diff --git a/sdk/python/tests/test_zmq_service.py → tests/test_zmq_service.py b/sdk/python/tests/test_zmq_service.py → tests/test_zmq_service.py
diff --git a/sdk/python/tests/unit_python_sdk.yaml → tests/unit_python_sdk.yaml b/sdk/python/tests/unit_python_sdk.yaml → tests/unit_python_sdk.yaml