Skip to content

Commit

Permalink
test python 11
Browse files Browse the repository at this point in the history
  • Loading branch information
sliu008 committed Apr 18, 2024
1 parent 50fe78a commit eb15ca0
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: '3.11'
- name: Install Poetry
uses: abatilo/actions-poetry@v3
with:
Expand Down Expand Up @@ -383,7 +383,7 @@ jobs:
github.ref == 'refs/heads/develop' ||
github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/heads/release')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/lambdaDockerfileArm
Expand Down Expand Up @@ -411,7 +411,7 @@ jobs:
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat' ||
github.event.head_commit.message == '/deploy sandbox'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/lambdaDockerfileArm
Expand Down
2 changes: 1 addition & 1 deletion .github/release-created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: 'refs/heads/develop'
- uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: '3.11'
- name: Install Poetry
uses: abatilo/actions-poetry@v3
with:
Expand Down
9 changes: 0 additions & 9 deletions podaac/lambda_handler/lambda_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,11 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.logger = cumulus_logger


def clean_all(self):
""" Removes anything saved to self.path """
rmtree(self.path)
clean_tmp()


def download_file_from_s3(self, s3file, working_dir):
""" Download s3 file to local
Expand All @@ -104,7 +102,6 @@ def download_file_from_s3(self, s3file, working_dir):
self.logger.error("Error downloading file %s: %s" % (s3file, working_dir), exc_info=True)
raise ex


def upload_file_to_s3(self, filename, uri):
""" Upload a local file to s3 if collection payload provided
Expand All @@ -121,7 +118,6 @@ def upload_file_to_s3(self, filename, uri):
self.logger.error("Error uploading file %s: %s" % (os.path.basename(os.path.basename(filename)), str(ex)), exc_info=True)
raise ex


@staticmethod
def get_file_type(filename, files):
"""Get custom file type, default to metadata
Expand All @@ -139,7 +135,6 @@ def get_file_type(filename, files):
return collection_file['type']
return 'metadata'


@staticmethod
def get_bucket(filename, files, buckets):
"""Extract the bucket from the files
Expand All @@ -165,7 +160,6 @@ def get_bucket(filename, files, buckets):
break
return buckets[bucket_type]


def get_config(self):
"""Get configuration file for image generations
Returns
Expand Down Expand Up @@ -193,7 +187,6 @@ def get_config(self):

return cfg_file_full_path


def process(self):
"""Main process to generate images for granules
Expand Down Expand Up @@ -229,13 +222,11 @@ def process(self):

return self.input


@classmethod
def handler(cls, event, context=None, path=None, noclean=False):
""" General event handler """
return cls.run(path=path, noclean=noclean, context=context, **event)


@classmethod
def run(cls, *args, **kwargs):
""" Run this payload with the given Process class """
Expand Down
16 changes: 11 additions & 5 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ packages = [
]

[tool.poetry.dependencies]
python = "^3.12"
python = "^3.11"
pyyaml = "^6.0"
alphashape = "^1.3.1"
np = "^1.0.2"
Expand Down

0 comments on commit eb15ca0

Please sign in to comment.