Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/configure…
Browse files Browse the repository at this point in the history
…-sensor-namespace
  • Loading branch information
dhpollack committed Jun 3, 2024
2 parents 4115a44 + 3947a0b commit 348c0b9
Show file tree
Hide file tree
Showing 97 changed files with 12,997 additions and 616 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/metaflow.s3_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- master
pull_request_target:
pull_request:
types:
- opened
- synchronize
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/test-stubs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-20.04]
ver: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
include:
- os: macos-latest
ver: "3.12"
- os: macos-latest
ver: "3.11"
- os: macos-latest
ver: "3.10"

steps:
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-20.04]
ver: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
include:
- os: macos-latest
ver: "3.12"
- os: macos-latest
ver: "3.11"
- os: macos-latest
ver: "3.10"

steps:
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
Expand All @@ -34,6 +41,8 @@ jobs:
uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # v2.3.3
with:
python-version: ${{ matrix.ver }}
env:
PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"

- name: Install Python ${{ matrix.ver }} dependencies
run: |
Expand All @@ -49,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest]
os: [ubuntu-20.04]
ver: ['4.0']

steps:
Expand All @@ -65,6 +74,8 @@ jobs:

- name: Install R ${{ matrix.ver }} Rlang dependencies
run: |
python3 -m venv path/to/venv
source path/to/venv/bin/activate
python3 -m pip install .
Rscript -e 'install.packages("devtools", repos="https://cloud.r-project.org", Ncpus=8)'
Rscript -e 'devtools::install_deps("R", dependencies=TRUE, repos="https://cloud.r-project.org", upgrade="default")'
Expand Down
8 changes: 8 additions & 0 deletions metaflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ class and related decorators.
DataArtifact,
)

# Import data class within tuple_util but not introduce new symbols.
from . import tuple_util

# Runner API
if sys.version_info >= (3, 7):
from .runner.metaflow_runner import Runner
from .runner.nbrun import NBRunner

__version_addl__ = []
_ext_debug("Loading top-level modules")
for m in _tl_modules:
Expand Down
13 changes: 13 additions & 0 deletions metaflow/_vendor/importlib_metadata.LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2017-2019 Jason R. Coombs, Barry Warsaw

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading

0 comments on commit 348c0b9

Please sign in to comment.