Skip to content

Commit

Permalink
1.3.0 to develop (#317)
Browse files Browse the repository at this point in the history
* Update .asf.yaml (#293)

Co-authored-by: rileykk <[email protected]>

* domspurge patch (#280)

* Fix delete query to account for PK update

* Fixed mistake in domspurge readme

---------

Co-authored-by: rileykk <[email protected]>

* Patch: Made conda dep changes accidentally omitted from geos PR

* SDAP-511 - Switch package manager to poetry (#301)

* Redid branch w/ correct base

I tried to just rebase but it didn't work properly

* Changelogs

* Delete old dockerfile

* Removed old conda install files

* Removed version.txt to just use pyproject.toml

---------

Co-authored-by: rileykk <[email protected]>

* Update release files

- 1.3.0 header in changelogs
- Removed incubation DISCLAIMER
- Removed incubation language from NOTICE and updated URLs
- Bumped versions
- Made copyright year current
- Poetry re-lock

* Fix Dockerfile for DISCLAIMER rm

---------

Co-authored-by: rileykk <[email protected]>
Co-authored-by: Stepheny Perez <[email protected]>
  • Loading branch information
3 people authored Jun 24, 2024
1 parent 4a386a5 commit cf45e5a
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 44 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [1.3.0] - 2024-06-10
### Added
- SDAP-506:
- Added STAC Catalog endpoint for matchup outputs
Expand Down
6 changes: 0 additions & 6 deletions DISCLAIMER

This file was deleted.

4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache SDAP (Incubating)
Copyright 2017 - 2023 The Apache Software Foundation
Apache SDAP
Copyright 2017 - 2024 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
6 changes: 3 additions & 3 deletions README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache SDAP release 1.2.0
Apache SDAP release 1.3.0

This is a source distribution of Apache SDAP - NEXUS.

Expand All @@ -8,7 +8,7 @@ CHANGELOG.md file.
The LICENSE and NOTICE files contain license information.

You can find instructions how to build the release at
https://incubator-sdap-nexus.readthedocs.io/en/latest/build.html
https://sdap-nexus.readthedocs.io/en/latest/build.html

Further information about Apache SDAP is available at its web site,
https://sdap.incubator.apache.org.
https://sdap.apache.org.
2 changes: 1 addition & 1 deletion docker/nexus-webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ COPY docker/nexus-webapp/install_nexusproto.sh /tmp/install_nexusproto.sh
COPY docker/nexus-webapp/entrypoint.sh /opt/entrypoint.sh

# Copy readme + ASF legal files
COPY README.md README DISCLAIMER LICENSE NOTICE ./
COPY README.md README LICENSE NOTICE ./

ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"

Expand Down
66 changes: 37 additions & 29 deletions poetry.lock

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

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[tool.poetry]
name = "sdap-nexus"
version = "1.2.0"
version = "1.3.0"
description = "Nexus component for Apache SDAP"
authors = ["SDAP PPMC <[email protected]>"]
authors = ["SDAP PMC <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
packages = [
Expand Down

0 comments on commit cf45e5a

Please sign in to comment.