Skip to content

Commit

Permalink
Merge pull request #73 from mullenkamp/dev
Browse files Browse the repository at this point in the history
fixed pydantic version
  • Loading branch information
mullenkamp authored Aug 17, 2023
2 parents 294f680 + ca3f883 commit 47adcd4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "hilltop-py" %}
{% set version = "2.2.3" %}
{% set version = "2.2.4" %}
# {% set sha256 = "72a156e328247c91cb7f5440ffa98069c0090892f8d9d07fd57e36c0611a0403" %}

# sha256 is the prefered checksum -- you can get it for a file with:
Expand Down Expand Up @@ -37,7 +37,7 @@ requirements:
run:
- python >=3.8
- pandas
- pydantic >2
- pydantic <2
- orjson
- requests

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pandas
pydantic>2
pydantic<2
orjson
requests
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
name = 'hilltop-py'
main_package = 'hilltoppy'
# datasets = 'datasets'
version = '2.2.3'
version = '2.2.4'
descrip = 'Functions to access Hilltop data'

# The below code is for readthedocs. To have sphinx/readthedocs interact with
Expand All @@ -19,7 +19,7 @@
if os.environ.get('READTHEDOCS', False) == 'True':
INSTALL_REQUIRES = []
else:
INSTALL_REQUIRES = ['pandas', 'pydantic>2', 'orjson', 'requests']
INSTALL_REQUIRES = ['pandas', 'pydantic<2', 'orjson', 'requests']

# Get the long description from the README file
with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
Expand Down

0 comments on commit 47adcd4

Please sign in to comment.