Skip to content

Commit

Permalink
Release 1.4.10
Browse files Browse the repository at this point in the history
  • Loading branch information
manning-ncsa committed May 28, 2022
1 parent ecbe596 commit 3157bb2
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 25 deletions.
6 changes: 4 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
## Contributors to `easyaccess`
This is an alphabetical list of contributors, if you feel you have contributed to the project and we have neglected adding you to the list please accept our apologizes and [let us know](mailto:[email protected]) to correct it.

This is an alphabetical list of contributors, if you feel you have contributed to the project and we have neglected adding you to the list please accept our apologizes and [let us know](https://des.ncsa.illinois.edu/help) to correct it.

- Monika Adamow
- Matias Carrasco Kind
- Alex Drlica-Wagner
- Landon Gelman
- Michael Johnson
- Audrey Koziol
- T. Andrew Manning
- Donald Petravick
- Eli Rykoff
- Ignacio Sevilla
- T. Andrew Manning
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changes

## v.1.4.10
#### 2022-MAY-28
- Correct version inconsistency
- Make requirements consistent between `setup.py` and `meta.yaml`
- Change references to personal email addresses to the DES help request page

## v.1.4.8
#### XXXX-XXX-XX
- Fix issues with hanging after a Oracle Error (#PR 173 and issue #130)
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


When contributing to this repository, please first discuss the change you wish to make via [issues](https://github.com/des-labs/easyaccess/issues),
[email](mailto:[email protected]), or any other method with the owners of this repository before making a change.
[DES help request form](https://des.ncsa.illinois.edu/help), or any other method with the owners of this repository before making a change.

Please note we have a [code of conduct](CODE_OF_CONDUCT.md) for this project, please follow it in all your interactions with the project.

Expand Down Expand Up @@ -35,6 +35,6 @@ All kind of contributions are welcome, from fixing bugs, resolving issues or sug

## Authors

Please see our [list of contributors](AUTHORS.md), if you feel you have contributed to the project and we have neglected adding you to the list please accept our apologizes and [let us know](mailto:[email protected]) to correct it.
Please see our [list of contributors](AUTHORS.md), if you feel you have contributed to the project and we have neglected adding you to the list please accept our apologizes and [let us know](https://des.ncsa.illinois.edu/help) to correct it.


2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Loading metadata into cache...
\\_______// DARK ENERGY SURVEY
`-------` DATA MANAGEMENT

easyaccess 1.4.8-dev. The DESDM Database shell.
easyaccess 1.4.10. The DESDM Database shell.
_________
DESDR ~> SELECT RA, DEC, MAG_AUTO_G, TILENAME FROM DR2_MAIN sample(0.001) FETCH FIRST 5 ROWS ONLY ;

Expand Down
32 changes: 16 additions & 16 deletions config/conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package:
name: easyaccess
version: "1.4.8"
version: "1.4.10"

source:
git_rev: 1.4.8
git_rev: 1.4.10
git_url: https://github.com/des-labs/easyaccess.git

build:
Expand All @@ -17,27 +17,27 @@ build:

requirements:
build:
- python
- future >=0.15.0
- pandas >= 0.14
- termcolor >= 1.1.0
- fitsio == 1.0.5
- cx_oracle == 8.0.1
- numpy == 1.19.2
- future >= 0.15.0
- requests
- pandas >=0.14
- termcolor >=1.1.0
- fitsio ==1.0.5
- oracle-instantclient ==11.2.0.4.0
- cx_oracle ==8.0.1
- numpy ==1.19.2
- python
- python-dateutil

run:
- python
- future >=0.15.0
- pandas >= 0.14
- termcolor >= 1.1.0
- fitsio == 1.0.5
- cx_oracle == 8.0.1
- numpy == 1.19.2
- future >= 0.15.0
- requests
- pandas >=0.14
- termcolor >=1.1.0
- fitsio ==1.0.5
- oracle-instantclient ==11.2.0.4.0
- cx_oracle ==8.0.1
- numpy ==1.19.2
- python
- python-dateutil

test:
Expand Down
2 changes: 1 addition & 1 deletion easyaccess/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def last_pip_version():
return sorted(uploads, key=lambda x: x[1])[-1][0]


version_tag = (1, 4, 8, 'dev')
version_tag = (1, 4, 10)
__version__ = ".".join(map(str, version_tag[:3]))

if len(version_tag) > 3:
Expand Down
12 changes: 10 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ def read(filename):
long_description=read('README.md'),
long_description_content_type='text/markdown',
url='https://github.com/des-labs/easyaccess',
install_requires=['pandas >= 0.14', 'termcolor', 'fitsio == 1.0.5', 'setuptools',
'cx_Oracle == 8.0.1', 'numpy >= 1.19.2', 'future >= 0.15.0', 'requests'],
install_requires=[
'pandas >= 0.14',
'termcolor',
'fitsio == 1.0.5',
'cx_Oracle == 8.0.1',
'numpy >= 1.19.2',
'future >= 0.15.0',
'requests',
'setuptools',
],
)

0 comments on commit 3157bb2

Please sign in to comment.