diff --git a/.github/actions/build-install-package/action.yml b/.github/actions/build-install-package/action.yml index c715764..7b01781 100644 --- a/.github/actions/build-install-package/action.yml +++ b/.github/actions/build-install-package/action.yml @@ -4,7 +4,7 @@ inputs: package_file: description: 'Path to package setup python script.' required: false - default: 'package_setup.py' + default: 'setup.py' outputs: wheel-file: description: "Wheel filename" diff --git a/.github/workflows/build_test_publish.yaml b/.github/workflows/build_test_publish.yaml index 3e5db44..2a7f80b 100644 --- a/.github/workflows/build_test_publish.yaml +++ b/.github/workflows/build_test_publish.yaml @@ -33,7 +33,7 @@ jobs: name: Build and install package uses: ./.github/actions/build-install-package with: - package_file: 'package_setup.py' + package_file: 'setup.py' - name: run unit tests run: | pip install lz4 diff --git a/.github/workflows/build_test_ubuntu.yaml b/.github/workflows/build_test_ubuntu.yaml index 41772eb..082e6d2 100644 --- a/.github/workflows/build_test_ubuntu.yaml +++ b/.github/workflows/build_test_ubuntu.yaml @@ -37,7 +37,7 @@ jobs: - name: Build and install package uses: ./.github/actions/build-install-package with: - package_file: 'package_setup.py' + package_file: 'setup.py' - name: run unit tests run: | pip install lz4 diff --git a/.github/workflows/build_test_windows.yaml b/.github/workflows/build_test_windows.yaml index a4d1544..4d91823 100644 --- a/.github/workflows/build_test_windows.yaml +++ b/.github/workflows/build_test_windows.yaml @@ -34,7 +34,7 @@ jobs: - name: Build and install package uses: ./.github/actions/build-install-package with: - package_file: 'package_setup.py' + package_file: 'setup.py' - name: run unit tests run: | pip install lz4 diff --git a/Jenkinsfile b/Jenkinsfile index 6ef725f..d9ecf08 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,13 +49,13 @@ podTemplate( sh 'pwd' sh 'ls -a' //sh 'python3.6 -m build' - sh 'python3.6 package_setup.py bdist_wheel' + sh 'python3.6 setup.py bdist_wheel' } stage('Install') { def curDate = sh(returnStdout: true, script: "date").trim() echo "The current date is ${curDate}" def wheelFile = sh(returnStdout: true, script: "find ./dist -name '*.whl'").toString().trim() - //def wheelFile = sh(returnStdout: true, script: "python3.6 ./.github/scripts/get_wheel_filename.py --package-file package_setup.py").toString().trim() + //def wheelFile = sh(returnStdout: true, script: "python3.6 ./.github/scripts/get_wheel_filename.py --package-file setup.py").toString().trim() echo "This is the package file: ${wheelFile}" sh "pip3.6 install $wheelFile" sh "pip3.6 freeze" diff --git a/README.md b/README.md index e5789b1..d8e888a 100644 --- a/README.md +++ b/README.md @@ -58,14 +58,14 @@ Output ## Dev Tips -- To build package: `python package_setup.py build` +- To build package: `python setup.py build` -- To build wheel (.whl): `python package_setup.py bdist_wheel` +- To build wheel (.whl): `python setup.py bdist_wheel` - To import package, you can either: - Set symlink to built module in build subdirectory - - do python package_setup.py install - - do python package_setup.py develop + - do python setup.py install + - do python setup.py develop - To install package (fill in actual version number in filename): ` pip install dist/emod_api...whl` diff --git a/emod_api_build_config.json b/emod_api_build_config.json index c5e2918..4525181 100644 --- a/emod_api_build_config.json +++ b/emod_api_build_config.json @@ -5,7 +5,7 @@ "packages": [ { "name": "emod_api", - "path": "package_setup.py", + "path": "setup.py", "test_path": ["emod_api/serialization/tests/dtkFileTests.py"], "steps": ["build", "build_wheel", "install_wheel", "test"] } diff --git a/package_setup.py b/package_setup.py deleted file mode 100644 index 27f63ea..0000000 --- a/package_setup.py +++ /dev/null @@ -1 +0,0 @@ -setup.py \ No newline at end of file